From 154fa2fe97926b5981ad8d7a7ab6b92e0eb62672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9lio=20Brun?= <lb@leliobrun.net>
Date: Wed, 10 May 2023 18:12:14 +0900
Subject: [PATCH] ensure that top node is named after the file

---
 lustrec_tests/lustre_files/DRAGON_1.lus                         | 2 +-
 lustrec_tests/lustre_files/DRAGON_10.lus                        | 2 +-
 lustrec_tests/lustre_files/DRAGON_10_e1_3587_e3_2749.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_10_e1_3587_e7_872.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_10_e1_998.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_10_e2_2785_e3_1744.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_10_e2_402.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_10_e3_144_e5_2046.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_10_e3_144_e7_523.lus          | 2 +-
 lustrec_tests/lustre_files/DRAGON_10_e3_3429.lus                | 2 +-
 lustrec_tests/lustre_files/DRAGON_10_e7_3861_e2_1020.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_10_e7_3861_e7_2180.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_11.lus                        | 2 +-
 lustrec_tests/lustre_files/DRAGON_11_e1_2450.lus                | 2 +-
 lustrec_tests/lustre_files/DRAGON_11_e1_2450_e1_5887.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_11_e1_2450_e2_1483.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_11_e1_2450_e3_2330.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_11_e1_2450_e7_5791.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_11_e2_1678_e1_3565.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_11_e2_5396_e3_282.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_11_e3_382_e1_505.lus          | 2 +-
 lustrec_tests/lustre_files/DRAGON_11_e3_382_e4_4421.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_12.lus                        | 2 +-
 lustrec_tests/lustre_files/DRAGON_12_e1_4640_e7_128.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_12_e2_1618.lus                | 2 +-
 lustrec_tests/lustre_files/DRAGON_12_e2_1618_e1_6030.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_12_e2_1618_e2_138.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_12_e2_1618_e3_2012.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_12_e2_1618_e7_4732.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_13.lus                        | 2 +-
 lustrec_tests/lustre_files/DRAGON_13_e3_1418_e3_2761.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_13_e7_2336.lus                | 2 +-
 lustrec_tests/lustre_files/DRAGON_13_e7_2336_e1_541.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_13_e7_2336_e2_1255.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_13_e7_2336_e3_3117.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_13_e7_2336_e7_685.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_14.lus                        | 2 +-
 lustrec_tests/lustre_files/DRAGON_14_e1_5710.lus                | 2 +-
 lustrec_tests/lustre_files/DRAGON_14_e2_3606.lus                | 2 +-
 lustrec_tests/lustre_files/DRAGON_14_e3_1259_e1_5798.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_14_e3_5120.lus                | 2 +-
 lustrec_tests/lustre_files/DRAGON_14_e7_3162.lus                | 2 +-
 lustrec_tests/lustre_files/DRAGON_14_e7_3162_e1_3998.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_14_e7_3162_e2_753.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_14_e7_3162_e3_4298.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_14_e7_3162_e7_3528.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_1_e1_14612_e1_268_e7_501.lus  | 2 +-
 .../lustre_files/DRAGON_1_e1_14612_e2_2653_e7_4370.lus          | 2 +-
 lustrec_tests/lustre_files/DRAGON_1_e1_3184_e7_1888.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_1_e1_5070.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_1_e2_1997.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_1_e2_1997_e7_3613_e2_3409.lus | 2 +-
 .../lustre_files/DRAGON_1_e3_11891_e7_4569_e4_4881.lus          | 2 +-
 lustrec_tests/lustre_files/DRAGON_2.lus                         | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e1_2316.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e2_3183_e1_2644.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e2_3183_e2_3580.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e2_3183_e3_5972.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e2_4481.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e7_25.lus                   | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e7_25_e1_154.lus            | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e7_25_e2_5340.lus           | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e7_25_e3_829.lus            | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e7_25_e7_4469.lus           | 2 +-
 lustrec_tests/lustre_files/DRAGON_2_e7_25_e8_3171.lus           | 2 +-
 lustrec_tests/lustre_files/DRAGON_3.lus                         | 2 +-
 lustrec_tests/lustre_files/DRAGON_3_e1_4783.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_3_e1_4783_e1_3755.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_3_e1_4783_e2_158.lus          | 2 +-
 lustrec_tests/lustre_files/DRAGON_3_e1_4783_e3_511.lus          | 2 +-
 lustrec_tests/lustre_files/DRAGON_3_e1_4783_e7_4070.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_3_e2_5343_e1_988.lus          | 2 +-
 lustrec_tests/lustre_files/DRAGON_3_e3_3846.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_3_e3_5422_e1_2288.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_3_e3_5422_e2_3135.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_3_e7_4884.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_4.lus                         | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e1_4312.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e2_2799.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e2_2799_e1_1303.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e2_2799_e2_2251.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e2_2799_e3_1915.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e2_2799_e7_2499.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e3_1540_e1_5048.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e3_4133.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e7_2329.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e7_2329_e3_4574.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_4_e7_2329_e7_3856.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_5.lus                         | 2 +-
 lustrec_tests/lustre_files/DRAGON_5_e1_1835.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_5_e2_3018_e2_936.lus          | 2 +-
 lustrec_tests/lustre_files/DRAGON_5_e7_2017.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_5_e7_2017_e1_5832.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_5_e7_2017_e2_664.lus          | 2 +-
 lustrec_tests/lustre_files/DRAGON_5_e7_2017_e3_1763.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_5_e7_2017_e7_2326.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_6.lus                         | 2 +-
 lustrec_tests/lustre_files/DRAGON_6_e7_5046_e7_3623.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_7.lus                         | 2 +-
 lustrec_tests/lustre_files/DRAGON_7_e2_2872_e2_5844.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_7_e2_2872_e3_2640.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_7_e7_3157_e2_2082.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_8.lus                         | 2 +-
 lustrec_tests/lustre_files/DRAGON_8_e2_3896_e3_3125.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_8_e3_786.lus                  | 2 +-
 lustrec_tests/lustre_files/DRAGON_8_e3_786_e7_4541.lus          | 2 +-
 lustrec_tests/lustre_files/DRAGON_8_e7_3752.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_9.lus                         | 2 +-
 lustrec_tests/lustre_files/DRAGON_9_e7_1843.lus                 | 2 +-
 lustrec_tests/lustre_files/DRAGON_9_e7_1843_e1_5434.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_9_e7_1843_e2_1145.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_9_e7_1843_e3_5316.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_9_e7_1843_e7_2225.lus         | 2 +-
 lustrec_tests/lustre_files/DRAGON_all.lus                       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2.lus                      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e2_2073_e8_3691.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e1_6463.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e2_5774.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e3_1543.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e4_3719.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e5_3642.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e8_5861.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e7_5406.lus              | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e1_6690.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e2_3084.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e3_506.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e7_6697.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e8_4626.lus              | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e8_5504.lus              | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e1_4719.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e2_1598.lus      | 2 +-
 lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e7_579.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e1_4022_e1_1759.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e1_4022_e2_267.lus        | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e1_4022_e3_3628.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e1_4022_e7_2886.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e1_4037.lus               | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e2_6104.lus               | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e2_6104_e1_6205.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e2_6104_e2_3308.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e2_6104_e3_2607.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e3_4821_e1_1318.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e3_4821_e2_1089.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e3_4821_e4_1791.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e3_4821_e5_1536.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e3_5957.lus               | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e7_1941_e2_6086.lus       | 2 +-
 lustrec_tests/lustre_files/DRAGON_all_e7_4065.lus               | 2 +-
 lustrec_tests/lustre_files/FIREFLY_1.lus                        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_10.lus                       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_10_e7_919_e2_3192.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_11.lus                       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_11_e1_3457.lus               | 2 +-
 lustrec_tests/lustre_files/FIREFLY_11_e3_2076_e1_1270.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_1_e1_1092.lus                | 2 +-
 lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e1_1486.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e2_1853.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e3_389.lus         | 2 +-
 lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e7_1119.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_2.lus                        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_2_e3_151_e3_1540.lus         | 2 +-
 lustrec_tests/lustre_files/FIREFLY_3.lus                        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_3_e2_2236.lus                | 2 +-
 lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e1_2305.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e2_1058.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e3_2657.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e7_3681.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_4.lus                        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_4_e3_3511.lus                | 2 +-
 lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e1_2375.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e2_1923.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e3_422.lus         | 2 +-
 lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e4_1464.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e5_3248.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e7_3568.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_5.lus                        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_5_e1_2552_e7_1169.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_5_e2_2229.lus                | 2 +-
 lustrec_tests/lustre_files/FIREFLY_5_e2_2884.lus                | 2 +-
 lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e1_2678.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e2_1492.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e3_1882.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e7_3594.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_6.lus                        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_6_e2_3302.lus                | 2 +-
 lustrec_tests/lustre_files/FIREFLY_7.lus                        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_8.lus                        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_8_e2_1711.lus                | 2 +-
 lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e1_1489.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e2_2673.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e3_1753.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e7_1962.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_9.lus                        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_9_e7_170_e3_3647.lus         | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3.lus                       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e1_3233.lus               | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e1_3123.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e2_2392.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e3_2970.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e7_906.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e1_3235.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e2_2689.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e3_2542.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e7_2614.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e2_2952.lus               | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e1_1979.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e2_2812.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e4_897.lus         | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all.lus                      | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e1_1201.lus      | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e2_3220.lus      | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e3_1928.lus      | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e7_156.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e1_3406.lus              | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e1_768.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e2_1767.lus      | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e3_3946.lus      | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e7_3371.lus      | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e2_3678.lus              | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e1_667.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e2_676.lus       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e3_2055.lus      | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e4_2415.lus      | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e5_84.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e7_1607.lus      | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e3_3496.lus              | 2 +-
 lustrec_tests/lustre_files/FIREFLY_all_e7_1909.lus              | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1a.lus                  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e1_2924.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e2_2755.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e3_3091.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e7_998.lus    | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1a_e7_3042_e3_1213.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b.lus                  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e1_1565.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e2_2893.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e3_1839.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1691.lus          | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049.lus          | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e1_946.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e2_698.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e3_2697.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671.lus           | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e1_725.lus    | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e2_2131.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e3_941.lus    | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e4_147.lus    | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e5_1637.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e6_1974.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e7_1882.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_2574.lus          | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191.lus          | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e1_1303.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e2_1864.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e3_1250.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e7_2146.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e8_2830.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_2.lus                   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_2_e2_1375_e1_418.lus    | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_2_e7_1826_e8_126.lus    | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_3.lus                   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_3_e1_2217_e3_1200.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_4.lus                   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_4_e2_325.lus            | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_5.lus                   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt.lus                  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913.lus           | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e1_1993.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e2_3353.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e3_2128.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e7_1403.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460.lus          | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e1_1455.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e2_2670.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e3_1333.lus  | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e7_471.lus   | 2 +-
 lustrec_tests/lustre_files/FIREFLY_luke_rt_e3_1549.lus          | 2 +-
 lustrec_tests/lustre_files/FIREFLY_rt.lus                       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_rt_e3_1770_e2_637.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_u1.lus                       | 2 +-
 lustrec_tests/lustre_files/FIREFLY_u1_e2_3403_e2_957.lus        | 2 +-
 lustrec_tests/lustre_files/FIREFLY_u1_e7_3318.lus               | 2 +-
 lustrec_tests/lustre_files/Gas.lus                              | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_1.lus                       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2.lus                       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2_e1_834.lus                | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e1_1895.lus        | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e2_3395.lus        | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e3_2931.lus        | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e7_3738.lus        | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e1_3182.lus       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e2_1561.lus       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e3_1601.lus       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e7_2728.lus       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_2_e2_876.lus                | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_3.lus                       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_3_e3_2581.lus               | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e1_1130.lus       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e2_2545.lus       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e3_979.lus        | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e4_958.lus        | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e5_4006.lus       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e7_3447.lus       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_4.lus                       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_4_e7_2651_e7_2847.lus       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_5.lus                       | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_5_e7_692_e7_2865.lus        | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_a1.lus                      | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_all.lus                     | 2 +-
 lustrec_tests/lustre_files/ILLINOIS_r4a.lus                     | 2 +-
 lustrec_tests/lustre_files/MESI_1.lus                           | 2 +-
 lustrec_tests/lustre_files/MESI_1_e2_162_e7_1545.lus            | 2 +-
 lustrec_tests/lustre_files/MESI_2.lus                           | 2 +-
 lustrec_tests/lustre_files/MESI_3.lus                           | 2 +-
 lustrec_tests/lustre_files/MESI_3_e1_2517_e8_2163.lus           | 2 +-
 lustrec_tests/lustre_files/MESI_3_e2_819.lus                    | 2 +-
 lustrec_tests/lustre_files/MESI_3_e2_819_e1_1145.lus            | 2 +-
 lustrec_tests/lustre_files/MESI_3_e2_819_e2_562.lus             | 2 +-
 lustrec_tests/lustre_files/MESI_3_e2_819_e3_2698.lus            | 2 +-
 lustrec_tests/lustre_files/MESI_3_e2_819_e4_1595.lus            | 2 +-
 lustrec_tests/lustre_files/MESI_3_e2_819_e5_2554.lus            | 2 +-
 lustrec_tests/lustre_files/MESI_3_e2_819_e6_1459.lus            | 2 +-
 lustrec_tests/lustre_files/MESI_3_e2_819_e7_1665.lus            | 2 +-
 lustrec_tests/lustre_files/MESI_3_e2_819_e8_1896.lus            | 2 +-
 lustrec_tests/lustre_files/MESI_3_e3_2669.lus                   | 2 +-
 lustrec_tests/lustre_files/MESI_4.lus                           | 2 +-
 lustrec_tests/lustre_files/MESI_4_e7_1140_e7_433.lus            | 2 +-
 lustrec_tests/lustre_files/MESI_all.lus                         | 2 +-
 lustrec_tests/lustre_files/MESI_all_e4_1147_e7_497.lus          | 2 +-
 lustrec_tests/lustre_files/MESI_i1.lus                          | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e2_1758_e8_12.lus            | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e2_2656.lus                  | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e3_2145.lus                  | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e3_2145_e1_2667.lus          | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e3_2145_e2_2228.lus          | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e3_2145_e3_977.lus           | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e3_2145_e4_1717.lus          | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e3_2145_e5_2391.lus          | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e3_2145_e7_1847.lus          | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e3_2145_e8_2325.lus          | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e4_1986.lus                  | 2 +-
 lustrec_tests/lustre_files/MESI_i1_e4_1986_e1_1519.lus          | 2 +-
 lustrec_tests/lustre_files/MESI_i2.lus                          | 2 +-
 lustrec_tests/lustre_files/MESI_i3.lus                          | 2 +-
 lustrec_tests/lustre_files/MESI_i3_e1_447.lus                   | 2 +-
 lustrec_tests/lustre_files/MESI_i3_e1_447_e1_1292.lus           | 2 +-
 lustrec_tests/lustre_files/MESI_i3_e1_447_e2_1098.lus           | 2 +-
 lustrec_tests/lustre_files/MESI_i3_e1_447_e3_1180.lus           | 2 +-
 lustrec_tests/lustre_files/MESI_i3_e1_447_e5_2444.lus           | 2 +-
 lustrec_tests/lustre_files/MESI_i3_e1_447_e6_2281.lus           | 2 +-
 lustrec_tests/lustre_files/MESI_i3_e1_447_e7_2194.lus           | 2 +-
 lustrec_tests/lustre_files/MESI_i4.lus                          | 2 +-
 lustrec_tests/lustre_files/MESI_i4_e4_1689.lus                  | 2 +-
 lustrec_tests/lustre_files/MESI_i4_e6_2175.lus                  | 2 +-
 lustrec_tests/lustre_files/MESI_i4_e7_1017_e6_1132.lus          | 2 +-
 lustrec_tests/lustre_files/MESI_i4_e8_1381_e1_1837.lus          | 2 +-
 lustrec_tests/lustre_files/MESI_i4_e8_1381_e4_313.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_1.lus                          | 2 +-
 lustrec_tests/lustre_files/MOESI_1_e2_982_e7_492.lus            | 2 +-
 lustrec_tests/lustre_files/MOESI_1_e3_1884_e7_1875.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2.lus                          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e1_1753.lus                  | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e1_1753_e1_1510.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e1_1753_e2_615.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e1_1753_e3_2021.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e2_155.lus                   | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e2_1599.lus                  | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e2_1599_e1_2383.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e2_1599_e2_1815.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e2_1599_e3_1658.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e2_1599_e8_1334.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e3_1523.lus                  | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e3_929.lus                   | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e3_929_e1_2319.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e3_929_e2_2421.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e3_929_e3_2294.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e3_929_e4_578.lus            | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e3_929_e5_1826.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e3_929_e6_2707.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e3_929_e7_619.lus            | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e3_929_e8_1167.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e7_2607.lus                  | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e7_2910.lus                  | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e7_2910_e1_1021.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e7_2910_e2_611.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e7_2910_e3_2002.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e7_2910_e7_1804.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e7_2910_e8_2590.lus          | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e8_101.lus                   | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e8_926.lus                   | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e8_926_e1_1065.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e8_926_e2_349.lus            | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e8_926_e3_1758.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e8_926_e7_961.lus            | 2 +-
 lustrec_tests/lustre_files/MOESI_2_e8_926_e8_2138.lus           | 2 +-
 lustrec_tests/lustre_files/MOESI_all.lus                        | 2 +-
 lustrec_tests/lustre_files/MOESI_all_e3_2032_e3_2788.lus        | 2 +-
 lustrec_tests/lustre_files/PRODUCER_CONSUMER_1.lus              | 2 +-
 lustrec_tests/lustre_files/PRODUCER_CONSUMER_2.lus              | 2 +-
 lustrec_tests/lustre_files/PRODUCER_CONSUMER_3.lus              | 2 +-
 lustrec_tests/lustre_files/PRODUCER_CONSUMER_all.lus            | 2 +-
 lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt.lus             | 2 +-
 lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e2_1352.lus     | 2 +-
 lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e3_507.lus      | 2 +-
 .../lustre_files/PRODUCER_CONSUMER_vt_e7_1059_e8_1111.lus       | 2 +-
 lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_1.lus        | 2 +-
 lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_2.lus        | 2 +-
 .../lustre_files/PRODUCER_CONSUMMER_luke_2_e7_1068_e8_1019.lus  | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123.lus                      | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e2_1653.lus              | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e3_302.lus               | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e3_302_e1_1141.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e2_1394.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e3_135.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e7_1262.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e7_856.lus               | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e8_953.lus               | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e1_1128.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e2_458.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e3_271.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e7_1465.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e8_941.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2.lus                        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2_e1_1239.lus                | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2_e1_1239_e1_1331.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2_e1_1239_e2_74.lus          | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2_e3_216.lus                 | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e1_667.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e2_237.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e3_1216.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e7_1043.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e8_1177.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_2_e8_656.lus                 | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3.lus                        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e1_1416.lus                | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e1_1675.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e2_753.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e3_1191.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e7_193.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e3_1041.lus                | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e7_1444_e7_638.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e7_425.lus                 | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e1_1270.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e2_236.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e3_421.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e7_1062.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e8_320.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_3_e8_1708.lus                | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_4.lus                        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_4_e8_420_e7_572.lus          | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_4_e8_420_e8_1525.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_4_e8_974.lus                 | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_5.lus                        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_5_e1_811.lus                 | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_5_e1_811_e1_823.lus          | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_5_e1_811_e2_1026.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_5_e2_1525.lus                | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_6.lus                        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_6_e2_1439_e1_954.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_6_e3_1666_e5_1558.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_6_e7_938_e2_1012.lus         | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_6_e8_1147_e2_1326.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all.lus                      | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e3_1750.lus              | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e3_495.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e4_34.lus        | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e5_1637.lus      | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e7_251.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e7_907.lus               | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e7_907_e7_1363.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e8_251.lus               | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e1_1852.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e2_1053.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e3_1472.lus       | 2 +-
 lustrec_tests/lustre_files/SYNAPSE_i1.lus                       | 2 +-
 lustrec_tests/lustre_files/_6counter2.lus                       | 2 +-
 lustrec_tests/lustre_files/_6countern.lus                       | 2 +-
 lustrec_tests/lustre_files/_6counters.lus                       | 2 +-
 lustrec_tests/lustre_files/_6counters_e3_140_e8_149.lus         | 2 +-
 lustrec_tests/lustre_files/_6counters_e8_371_e1_448.lus         | 2 +-
 lustrec_tests/lustre_files/_6counters_e8_371_e2_80.lus          | 2 +-
 lustrec_tests/lustre_files/_6counters_e8_371_e3_224.lus         | 2 +-
 lustrec_tests/lustre_files/_6counters_e8_371_e7_304.lus         | 2 +-
 lustrec_tests/lustre_files/car_1.lus                            | 2 +-
 lustrec_tests/lustre_files/car_1_e7_184_e3_299.lus              | 2 +-
 lustrec_tests/lustre_files/car_2.lus                            | 2 +-
 lustrec_tests/lustre_files/car_2_e7_1027_e1_1047.lus            | 2 +-
 lustrec_tests/lustre_files/car_2_e7_1027_e7_359.lus             | 2 +-
 lustrec_tests/lustre_files/car_2_e8_491_e7_826.lus              | 2 +-
 lustrec_tests/lustre_files/car_3.lus                            | 2 +-
 lustrec_tests/lustre_files/car_3_e1_586.lus                     | 2 +-
 lustrec_tests/lustre_files/car_3_e1_924.lus                     | 2 +-
 lustrec_tests/lustre_files/car_3_e2_695.lus                     | 2 +-
 lustrec_tests/lustre_files/car_3_e2_777.lus                     | 2 +-
 lustrec_tests/lustre_files/car_3_e7_626.lus                     | 2 +-
 lustrec_tests/lustre_files/car_3_e7_626_e1_305.lus              | 2 +-
 lustrec_tests/lustre_files/car_3_e8_33.lus                      | 2 +-
 lustrec_tests/lustre_files/car_3_e8_33_e1_856.lus               | 2 +-
 lustrec_tests/lustre_files/car_3_e8_33_e2_1010.lus              | 2 +-
 lustrec_tests/lustre_files/car_3_e8_33_e7_220.lus               | 2 +-
 lustrec_tests/lustre_files/car_4.lus                            | 2 +-
 lustrec_tests/lustre_files/car_4_e3_556.lus                     | 2 +-
 lustrec_tests/lustre_files/car_4_e3_57.lus                      | 2 +-
 lustrec_tests/lustre_files/car_4_e3_57_e4_1047.lus              | 2 +-
 lustrec_tests/lustre_files/car_4_e3_57_e5_999.lus               | 2 +-
 lustrec_tests/lustre_files/car_4_e3_57_e6_784.lus               | 2 +-
 lustrec_tests/lustre_files/car_4_e7_592.lus                     | 2 +-
 lustrec_tests/lustre_files/car_4_e7_592_e3_442.lus              | 2 +-
 lustrec_tests/lustre_files/car_4_e7_592_e7_265.lus              | 2 +-
 lustrec_tests/lustre_files/car_4_e8_118.lus                     | 2 +-
 lustrec_tests/lustre_files/car_4_e8_118_e3_514.lus              | 2 +-
 lustrec_tests/lustre_files/car_4_e8_118_e7_178.lus              | 2 +-
 lustrec_tests/lustre_files/car_5.lus                            | 2 +-
 lustrec_tests/lustre_files/car_5_e2_405_e2_1083.lus             | 2 +-
 lustrec_tests/lustre_files/car_5_e2_405_e3_473.lus              | 2 +-
 lustrec_tests/lustre_files/car_5_e2_405_e8_1055.lus             | 2 +-
 lustrec_tests/lustre_files/car_5_e3_11_e1_429.lus               | 2 +-
 lustrec_tests/lustre_files/car_5_e3_11_e5_24.lus                | 2 +-
 lustrec_tests/lustre_files/car_5_e3_661.lus                     | 2 +-
 lustrec_tests/lustre_files/car_5_e7_244.lus                     | 2 +-
 lustrec_tests/lustre_files/car_5_e7_244_e1_823.lus              | 2 +-
 lustrec_tests/lustre_files/car_5_e7_244_e2_693.lus              | 2 +-
 lustrec_tests/lustre_files/car_5_e7_244_e3_1071.lus             | 2 +-
 lustrec_tests/lustre_files/car_6.lus                            | 2 +-
 lustrec_tests/lustre_files/car_6_e1_152.lus                     | 2 +-
 lustrec_tests/lustre_files/car_6_e1_152_e1_391.lus              | 2 +-
 lustrec_tests/lustre_files/car_6_e2_589_e2_506.lus              | 2 +-
 lustrec_tests/lustre_files/car_6_e2_589_e3_349.lus              | 2 +-
 lustrec_tests/lustre_files/car_6_e2_893.lus                     | 2 +-
 lustrec_tests/lustre_files/car_6_e3_294_e1_956.lus              | 2 +-
 lustrec_tests/lustre_files/car_6_e3_294_e3_47.lus               | 2 +-
 lustrec_tests/lustre_files/car_6_e3_294_e5_979.lus              | 2 +-
 lustrec_tests/lustre_files/car_all.lus                          | 2 +-
 lustrec_tests/lustre_files/car_all_e1_618.lus                   | 2 +-
 lustrec_tests/lustre_files/car_all_e1_618_e3_303.lus            | 2 +-
 lustrec_tests/lustre_files/car_all_e2_142.lus                   | 2 +-
 lustrec_tests/lustre_files/car_all_e2_142_e7_209.lus            | 2 +-
 lustrec_tests/lustre_files/car_all_e3_1068.lus                  | 2 +-
 lustrec_tests/lustre_files/car_all_e3_1068_e1_178.lus           | 2 +-
 lustrec_tests/lustre_files/car_all_e3_1068_e2_13.lus            | 2 +-
 lustrec_tests/lustre_files/car_all_e3_1068_e3_163.lus           | 2 +-
 lustrec_tests/lustre_files/car_all_e3_1068_e4_275.lus           | 2 +-
 lustrec_tests/lustre_files/car_all_e3_1068_e5_882.lus           | 2 +-
 lustrec_tests/lustre_files/car_all_e7_188_e7_743.lus            | 2 +-
 lustrec_tests/lustre_files/car_all_e8_856.lus                   | 2 +-
 lustrec_tests/lustre_files/car_all_e8_856_e1_217.lus            | 2 +-
 lustrec_tests/lustre_files/car_all_e8_856_e2_585.lus            | 2 +-
 lustrec_tests/lustre_files/car_all_e8_856_e3_180.lus            | 2 +-
 lustrec_tests/lustre_files/car_all_e8_856_e7_578.lus            | 2 +-
 lustrec_tests/lustre_files/ccp02.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp03.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp04.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp05.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp06.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp07.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp08.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp09.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp10.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp11.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp12.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp13.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp14.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp15.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp16.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp17.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp18.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp19.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp20.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp21.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp22.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp23.lus                            | 2 +-
 lustrec_tests/lustre_files/ccp24.lus                            | 2 +-
 lustrec_tests/lustre_files/cd.lus                               | 2 +-
 lustrec_tests/lustre_files/cd_e7_621_e7_669.lus                 | 2 +-
 lustrec_tests/lustre_files/cd_e7_8.lus                          | 2 +-
 lustrec_tests/lustre_files/chain4_1.lus                         | 2 +-
 lustrec_tests/lustre_files/chain4_4.lus                         | 2 +-
 lustrec_tests/lustre_files/chain4_l2.lus                        | 2 +-
 lustrec_tests/lustre_files/chain5_4.lus                         | 2 +-
 lustrec_tests/lustre_files/chain5_6.lus                         | 2 +-
 lustrec_tests/lustre_files/chain6_l2.lus                        | 2 +-
 lustrec_tests/lustre_files/counters.lus                         | 2 +-
 lustrec_tests/lustre_files/cruise_controller_01.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_02.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_03.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_04.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_05.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_06.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_07.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_08.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_09.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_10.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_11.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_12.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_13.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_14.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_15.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_16.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_17.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_18.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_19.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_20.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_21.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_22.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_23.lus             | 2 +-
 lustrec_tests/lustre_files/cruise_controller_24.lus             | 2 +-
 lustrec_tests/lustre_files/durationThm_1.lus                    | 2 +-
 lustrec_tests/lustre_files/durationThm_1_e1_350.lus             | 2 +-
 lustrec_tests/lustre_files/durationThm_1_e2_3.lus               | 2 +-
 lustrec_tests/lustre_files/durationThm_1_e3_389.lus             | 2 +-
 lustrec_tests/lustre_files/durationThm_1_e3_389_e4_294.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_1_e3_389_e5_5.lus        | 2 +-
 lustrec_tests/lustre_files/durationThm_1_e7_217.lus             | 2 +-
 lustrec_tests/lustre_files/durationThm_1_e7_217_e1_89.lus       | 2 +-
 lustrec_tests/lustre_files/durationThm_1_e7_217_e2_352.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_1_e7_217_e3_132.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_1_e7_217_e7_31.lus       | 2 +-
 lustrec_tests/lustre_files/durationThm_2.lus                    | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e1_301.lus             | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e2_63.lus              | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e3_329_e4_1.lus        | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e3_329_e5_124.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e3_99.lus              | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e7_145_e1_343.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e7_145_e2_169.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e7_145_e3_222.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e7_145_e7_154.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e7_145_e8_73.lus       | 2 +-
 lustrec_tests/lustre_files/durationThm_2_e7_149.lus             | 2 +-
 lustrec_tests/lustre_files/durationThm_3.lus                    | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e1_36.lus              | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e1_71.lus              | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e2_148.lus             | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e2_63.lus              | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e3_207.lus             | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e3_442.lus             | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e3_442_e4_165.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e3_442_e5_260.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e7_334.lus             | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e7_334_e1_431.lus      | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e7_334_e2_62.lus       | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e7_334_e3_42.lus       | 2 +-
 lustrec_tests/lustre_files/durationThm_3_e7_334_e7_118.lus      | 2 +-
 lustrec_tests/lustre_files/ex1.lus                              | 2 +-
 lustrec_tests/lustre_files/ex1reset.lus                         | 2 +-
 lustrec_tests/lustre_files/ex1sat.lus                           | 2 +-
 lustrec_tests/lustre_files/ex2.lus                              | 2 +-
 lustrec_tests/lustre_files/ex2reset.lus                         | 2 +-
 lustrec_tests/lustre_files/ex2sat.lus                           | 2 +-
 lustrec_tests/lustre_files/ex3.lus                              | 2 +-
 lustrec_tests/lustre_files/ex3_e7_590_e7_590.lus                | 2 +-
 lustrec_tests/lustre_files/ex3_e7_655.lus                       | 2 +-
 lustrec_tests/lustre_files/ex3_e8_381.lus                       | 2 +-
 lustrec_tests/lustre_files/ex3_e8_381_e7_224.lus                | 2 +-
 lustrec_tests/lustre_files/ex3_e8_381_e8_477.lus                | 2 +-
 lustrec_tests/lustre_files/ex3reset.lus                         | 2 +-
 lustrec_tests/lustre_files/ex3sat.lus                           | 2 +-
 lustrec_tests/lustre_files/ex4.lus                              | 2 +-
 lustrec_tests/lustre_files/ex4reset.lus                         | 2 +-
 lustrec_tests/lustre_files/ex4sat.lus                           | 2 +-
 lustrec_tests/lustre_files/ex5.lus                              | 2 +-
 lustrec_tests/lustre_files/ex5reset.lus                         | 2 +-
 lustrec_tests/lustre_files/ex5sat.lus                           | 2 +-
 lustrec_tests/lustre_files/ex6.lus                              | 2 +-
 lustrec_tests/lustre_files/ex6reset.lus                         | 2 +-
 lustrec_tests/lustre_files/ex6sat.lus                           | 2 +-
 lustrec_tests/lustre_files/ex7.lus                              | 2 +-
 lustrec_tests/lustre_files/ex7reset.lus                         | 2 +-
 lustrec_tests/lustre_files/ex7sat.lus                           | 2 +-
 lustrec_tests/lustre_files/ex8.lus                              | 2 +-
 lustrec_tests/lustre_files/ex8_e7_74.lus                        | 2 +-
 lustrec_tests/lustre_files/ex8_e7_74_e7_740.lus                 | 2 +-
 lustrec_tests/lustre_files/ex8_e7_74_e8_302.lus                 | 2 +-
 lustrec_tests/lustre_files/ex8_e8_220.lus                       | 2 +-
 lustrec_tests/lustre_files/ex8_e8_220_e7_249.lus                | 2 +-
 lustrec_tests/lustre_files/ex8_e8_376.lus                       | 2 +-
 lustrec_tests/lustre_files/ex8reset.lus                         | 2 +-
 lustrec_tests/lustre_files/ex8sat.lus                           | 2 +-
 lustrec_tests/lustre_files/fast_1.lus                           | 2 +-
 lustrec_tests/lustre_files/fast_1_e7_2044.lus                   | 2 +-
 lustrec_tests/lustre_files/fast_1_e7_2044_e7_1287.lus           | 2 +-
 lustrec_tests/lustre_files/fast_1_e8_747_e7_692.lus             | 2 +-
 lustrec_tests/lustre_files/fast_1_e8_747_e8_1041.lus            | 2 +-
 lustrec_tests/lustre_files/fast_1_e8_751.lus                    | 2 +-
 lustrec_tests/lustre_files/fast_2.lus                           | 2 +-
 lustrec_tests/lustre_files/fast_2_e7_2526.lus                   | 2 +-
 lustrec_tests/lustre_files/fast_2_e7_2526_e7_2736.lus           | 2 +-
 lustrec_tests/lustre_files/fast_2_e8_460_e7_43.lus              | 2 +-
 lustrec_tests/lustre_files/fast_2_e8_460_e8_1920.lus            | 2 +-
 lustrec_tests/lustre_files/fast_2_e8_976.lus                    | 2 +-
 lustrec_tests/lustre_files/heater4.lus                          | 2 +-
 lustrec_tests/lustre_files/hysteresis_2.lus                     | 2 +-
 lustrec_tests/lustre_files/hysteresis_3.lus                     | 2 +-
 lustrec_tests/lustre_files/hysteresis_all.lus                   | 2 +-
 lustrec_tests/lustre_files/lp_iir_9600_2.lus                    | 2 +-
 lustrec_tests/lustre_files/lp_iir_9600_4.lus                    | 2 +-
 lustrec_tests/lustre_files/lp_iir_9600_4_elliptic.lus           | 2 +-
 lustrec_tests/lustre_files/lp_iir_9600_6_elliptic.lus           | 2 +-
 lustrec_tests/lustre_files/metros_1.lus                         | 2 +-
 lustrec_tests/lustre_files/metros_1_e1_846_e1_1317.lus          | 2 +-
 lustrec_tests/lustre_files/metros_1_e1_846_e2_1394.lus          | 2 +-
 lustrec_tests/lustre_files/metros_1_e1_846_e3_1060.lus          | 2 +-
 lustrec_tests/lustre_files/metros_1_e1_846_e7_397.lus           | 2 +-
 lustrec_tests/lustre_files/metros_1_e2_1102_e1_317.lus          | 2 +-
 lustrec_tests/lustre_files/metros_1_e2_1102_e2_943.lus          | 2 +-
 lustrec_tests/lustre_files/metros_1_e2_1102_e3_961.lus          | 2 +-
 lustrec_tests/lustre_files/metros_1_e2_1102_e7_1163.lus         | 2 +-
 lustrec_tests/lustre_files/metros_1_e2_627.lus                  | 2 +-
 lustrec_tests/lustre_files/metros_1_e7_1255_e7_12.lus           | 2 +-
 lustrec_tests/lustre_files/metros_1_e7_606.lus                  | 2 +-
 lustrec_tests/lustre_files/metros_1_e8_725.lus                  | 2 +-
 lustrec_tests/lustre_files/metros_1_e8_725_e1_919.lus           | 2 +-
 lustrec_tests/lustre_files/metros_1_e8_725_e2_1144.lus          | 2 +-
 lustrec_tests/lustre_files/metros_1_e8_725_e3_556.lus           | 2 +-
 lustrec_tests/lustre_files/metros_2.lus                         | 2 +-
 lustrec_tests/lustre_files/metros_2_e1_1116.lus                 | 2 +-
 lustrec_tests/lustre_files/metros_2_e1_1116_e1_556.lus          | 2 +-
 lustrec_tests/lustre_files/metros_2_e1_1116_e2_617.lus          | 2 +-
 lustrec_tests/lustre_files/metros_2_e1_1116_e3_287.lus          | 2 +-
 lustrec_tests/lustre_files/metros_2_e1_1116_e7_1440.lus         | 2 +-
 lustrec_tests/lustre_files/metros_2_e1_190.lus                  | 2 +-
 lustrec_tests/lustre_files/metros_2_e2_704_e1_389.lus           | 2 +-
 lustrec_tests/lustre_files/metros_2_e2_704_e2_13.lus            | 2 +-
 lustrec_tests/lustre_files/metros_2_e2_704_e3_76.lus            | 2 +-
 lustrec_tests/lustre_files/metros_2_e2_704_e7_810.lus           | 2 +-
 lustrec_tests/lustre_files/metros_2_e2_968.lus                  | 2 +-
 lustrec_tests/lustre_files/metros_2_e3_112.lus                  | 2 +-
 lustrec_tests/lustre_files/metros_3.lus                         | 2 +-
 lustrec_tests/lustre_files/metros_3_e3_1275.lus                 | 2 +-
 lustrec_tests/lustre_files/metros_3_e3_1275_e1_1350.lus         | 2 +-
 lustrec_tests/lustre_files/metros_3_e3_1275_e2_454.lus          | 2 +-
 lustrec_tests/lustre_files/metros_3_e3_1275_e3_640.lus          | 2 +-
 lustrec_tests/lustre_files/metros_3_e3_1275_e4_164.lus          | 2 +-
 lustrec_tests/lustre_files/metros_3_e3_1275_e5_846.lus          | 2 +-
 lustrec_tests/lustre_files/metros_3_e3_1275_e6_1315.lus         | 2 +-
 lustrec_tests/lustre_files/metros_3_e3_1275_e7_529.lus          | 2 +-
 lustrec_tests/lustre_files/metros_3_e4_987.lus                  | 2 +-
 lustrec_tests/lustre_files/metros_3_e4_987_e2_80.lus            | 2 +-
 lustrec_tests/lustre_files/metros_3_e4_987_e3_291.lus           | 2 +-
 lustrec_tests/lustre_files/metros_4.lus                         | 2 +-
 lustrec_tests/lustre_files/metros_4_e1_821_e5_911.lus           | 2 +-
 lustrec_tests/lustre_files/metros_4_e1_917.lus                  | 2 +-
 lustrec_tests/lustre_files/metros_4_e2_968.lus                  | 2 +-
 lustrec_tests/lustre_files/metros_4_e2_968_e1_956.lus           | 2 +-
 lustrec_tests/lustre_files/metros_4_e2_968_e2_1166.lus          | 2 +-
 lustrec_tests/lustre_files/metros_4_e2_968_e3_931.lus           | 2 +-
 lustrec_tests/lustre_files/metros_4_e2_968_e4_801.lus           | 2 +-
 lustrec_tests/lustre_files/metros_4_e2_968_e5_991.lus           | 2 +-
 lustrec_tests/lustre_files/metros_4_e2_968_e6_236.lus           | 2 +-
 lustrec_tests/lustre_files/metros_4_e2_968_e7_860.lus           | 2 +-
 lustrec_tests/lustre_files/metros_4_e3_1025.lus                 | 2 +-
 lustrec_tests/lustre_files/metros_4_e3_1091.lus                 | 2 +-
 lustrec_tests/lustre_files/metros_4_e3_1091_e1_1044.lus         | 2 +-
 lustrec_tests/lustre_files/metros_4_e3_1091_e2_1317.lus         | 2 +-
 lustrec_tests/lustre_files/metros_4_e3_1091_e3_522.lus          | 2 +-
 lustrec_tests/lustre_files/metros_4_e3_1091_e4_232.lus          | 2 +-
 lustrec_tests/lustre_files/metros_4_e5_1150.lus                 | 2 +-
 lustrec_tests/lustre_files/metros_4_e6_239_e2_307.lus           | 2 +-
 lustrec_tests/lustre_files/metros_5.lus                         | 2 +-
 lustrec_tests/lustre_files/metros_5_e4_1208_e1_337.lus          | 2 +-
 lustrec_tests/lustre_files/microwave01.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave02.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave03.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave04.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave05.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave06.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave07.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave08.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave09.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave10.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave11.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave12.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave13.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave14.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave15.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave16.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave17.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave18.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave19.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave20.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave21.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave22.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave23.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave24.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave25.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave27.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave28.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave30.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave31.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave32.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave33.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave34.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave35.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave36.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave37.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave38.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave39.lus                      | 2 +-
 lustrec_tests/lustre_files/microwave40.lus                      | 2 +-
 lustrec_tests/lustre_files/peterson_1.lus                       | 2 +-
 lustrec_tests/lustre_files/peterson_1_e7_4234.lus               | 2 +-
 lustrec_tests/lustre_files/peterson_2.lus                       | 2 +-
 lustrec_tests/lustre_files/peterson_3.lus                       | 2 +-
 lustrec_tests/lustre_files/peterson_4.lus                       | 2 +-
 lustrec_tests/lustre_files/peterson_all.lus                     | 2 +-
 lustrec_tests/lustre_files/peterson_vt.lus                      | 2 +-
 lustrec_tests/lustre_files/readwrit.lus                         | 2 +-
 lustrec_tests/lustre_files/rtp_1.lus                            | 2 +-
 lustrec_tests/lustre_files/rtp_10.lus                           | 2 +-
 lustrec_tests/lustre_files/rtp_10_e7_106_e7_2564.lus            | 2 +-
 lustrec_tests/lustre_files/rtp_2.lus                            | 2 +-
 lustrec_tests/lustre_files/rtp_3.lus                            | 2 +-
 lustrec_tests/lustre_files/rtp_4.lus                            | 2 +-
 lustrec_tests/lustre_files/rtp_5.lus                            | 2 +-
 lustrec_tests/lustre_files/rtp_5_e7_3972.lus                    | 2 +-
 lustrec_tests/lustre_files/rtp_6.lus                            | 2 +-
 lustrec_tests/lustre_files/rtp_7.lus                            | 2 +-
 lustrec_tests/lustre_files/rtp_8.lus                            | 2 +-
 lustrec_tests/lustre_files/rtp_9.lus                            | 2 +-
 lustrec_tests/lustre_files/rtp_all.lus                          | 2 +-
 lustrec_tests/lustre_files/rtp_all_e7_2500.lus                  | 2 +-
 lustrec_tests/lustre_files/rtp_vt.lus                           | 2 +-
 lustrec_tests/lustre_files/speed2.lus                           | 2 +-
 lustrec_tests/lustre_files/speed2_e7_223_e7_213.lus             | 2 +-
 lustrec_tests/lustre_files/speed2_e7_223_e8_329.lus             | 2 +-
 lustrec_tests/lustre_files/speed2_e7_496.lus                    | 2 +-
 lustrec_tests/lustre_files/speed2_e8_449.lus                    | 2 +-
 lustrec_tests/lustre_files/speed2_e8_449_e7_353.lus             | 2 +-
 lustrec_tests/lustre_files/speed2_e8_449_e8_517.lus             | 2 +-
 lustrec_tests/lustre_files/speed2_e8_750.lus                    | 2 +-
 lustrec_tests/lustre_files/speed_e7_207.lus                     | 2 +-
 lustrec_tests/lustre_files/speed_e7_207_e7_538.lus              | 2 +-
 lustrec_tests/lustre_files/speed_e7_207_e8_507.lus              | 2 +-
 lustrec_tests/lustre_files/speed_e7_492.lus                     | 2 +-
 lustrec_tests/lustre_files/speed_e8_649.lus                     | 2 +-
 lustrec_tests/lustre_files/speed_e8_649_e7_709.lus              | 2 +-
 lustrec_tests/lustre_files/stalmark.lus                         | 2 +-
 lustrec_tests/lustre_files/stalmark_e7_27.lus                   | 2 +-
 lustrec_tests/lustre_files/stalmark_e7_27_e7_31.lus             | 2 +-
 lustrec_tests/lustre_files/stalmark_e7_76.lus                   | 2 +-
 lustrec_tests/lustre_files/stalmark_e8_48.lus                   | 2 +-
 lustrec_tests/lustre_files/stalmark_e8_64.lus                   | 2 +-
 lustrec_tests/lustre_files/stalmark_e8_64_e7_80.lus             | 2 +-
 lustrec_tests/lustre_files/stalmark_e8_64_e8_207.lus            | 2 +-
 lustrec_tests/lustre_files/steam_boiler.lus                     | 2 +-
 .../lustre_files/steam_boiler_no_arr2_e6_3003_e4_15091.lus      | 2 +-
 lustrec_tests/lustre_files/swimmingpool_1.lus                   | 2 +-
 lustrec_tests/lustre_files/swimmingpool_1_e7_1621.lus           | 2 +-
 lustrec_tests/lustre_files/swimmingpool_2.lus                   | 2 +-
 lustrec_tests/lustre_files/swimmingpool_3.lus                   | 2 +-
 lustrec_tests/lustre_files/swimmingpool_4.lus                   | 2 +-
 lustrec_tests/lustre_files/swimmingpool_4_e7_2197.lus           | 2 +-
 lustrec_tests/lustre_files/swimmingpool_5.lus                   | 2 +-
 lustrec_tests/lustre_files/swimmingpool_6.lus                   | 2 +-
 lustrec_tests/lustre_files/swimmingpool_6_e7_10_e7_341.lus      | 2 +-
 lustrec_tests/lustre_files/swimmingpool_6_e7_399.lus            | 2 +-
 lustrec_tests/lustre_files/swimmingpool_7.lus                   | 2 +-
 lustrec_tests/lustre_files/swimmingpool_8.lus                   | 2 +-
 lustrec_tests/lustre_files/swimmingpool_9.lus                   | 2 +-
 lustrec_tests/lustre_files/switch.lus                           | 2 +-
 lustrec_tests/lustre_files/switch2.lus                          | 2 +-
 lustrec_tests/lustre_files/test_counter2.lus                    | 2 +-
 lustrec_tests/lustre_files/test_ok.lus                          | 2 +-
 lustrec_tests/lustre_files/ticket3i_1.lus                       | 2 +-
 lustrec_tests/lustre_files/ticket3i_1_e7_1669.lus               | 2 +-
 lustrec_tests/lustre_files/ticket3i_2.lus                       | 2 +-
 lustrec_tests/lustre_files/ticket3i_3.lus                       | 2 +-
 lustrec_tests/lustre_files/ticket3i_3_e7_1312.lus               | 2 +-
 lustrec_tests/lustre_files/ticket3i_3_e7_1312_e7_1495.lus       | 2 +-
 lustrec_tests/lustre_files/ticket3i_3_e7_1312_e8_1916.lus       | 2 +-
 lustrec_tests/lustre_files/ticket3i_3_e7_99.lus                 | 2 +-
 lustrec_tests/lustre_files/ticket3i_3_e8_1703.lus               | 2 +-
 lustrec_tests/lustre_files/ticket3i_3_e8_1703_e7_3491.lus       | 2 +-
 lustrec_tests/lustre_files/ticket3i_3_e8_1703_e8_2560.lus       | 2 +-
 lustrec_tests/lustre_files/ticket3i_3_e8_1788.lus               | 2 +-
 lustrec_tests/lustre_files/ticket3i_4.lus                       | 2 +-
 lustrec_tests/lustre_files/ticket3i_4_e7_1775_e7_3320.lus       | 2 +-
 lustrec_tests/lustre_files/ticket3i_5.lus                       | 2 +-
 lustrec_tests/lustre_files/ticket3i_5_e7_3307.lus               | 2 +-
 lustrec_tests/lustre_files/ticket3i_6.lus                       | 2 +-
 lustrec_tests/lustre_files/ticket3i_6_e7_1096_e7_2688.lus       | 2 +-
 lustrec_tests/lustre_files/ticket3i_7.lus                       | 2 +-
 lustrec_tests/lustre_files/ticket3i_7_e1_2192_e1_1852.lus       | 2 +-
 lustrec_tests/lustre_files/ticket3i_7_e2_2724_e7_524.lus        | 2 +-
 lustrec_tests/lustre_files/ticket3i_7_e3_59_e7_2122.lus         | 2 +-
 lustrec_tests/lustre_files/ticket3i_7_e7_3176.lus               | 2 +-
 lustrec_tests/lustre_files/ticket3i_7_e7_3176_e1_2924.lus       | 2 +-
 lustrec_tests/lustre_files/ticket3i_7_e8_2126_e7_78.lus         | 2 +-
 lustrec_tests/lustre_files/ticket3i_all.lus                     | 2 +-
 lustrec_tests/lustre_files/ticket3i_all_e1_2706_e7_1776.lus     | 2 +-
 lustrec_tests/lustre_files/ticket3i_all_e2_1117_e7_553.lus      | 2 +-
 lustrec_tests/lustre_files/ticket3i_all_e3_557_e7_3464.lus      | 2 +-
 lustrec_tests/lustre_files/ticket3i_all_e7_1837.lus             | 2 +-
 lustrec_tests/lustre_files/ticket3i_all_e7_591.lus              | 2 +-
 lustrec_tests/lustre_files/ticket3i_all_e8_505_e7_2450.lus      | 2 +-
 lustrec_tests/lustre_files/traffic.lus                          | 2 +-
 lustrec_tests/lustre_files/traffic_e7_46.lus                    | 2 +-
 lustrec_tests/lustre_files/traffic_e7_46_e7_171.lus             | 2 +-
 lustrec_tests/lustre_files/tramway.lus                          | 2 +-
 lustrec_tests/lustre_files/tramway_e7_1834.lus                  | 2 +-
 lustrec_tests/lustre_files/tramway_e7_1834_e7_2363.lus          | 2 +-
 lustrec_tests/lustre_files/tramway_e7_1834_e8_3192.lus          | 2 +-
 lustrec_tests/lustre_files/tramway_e7_3304.lus                  | 2 +-
 lustrec_tests/lustre_files/twisted_counters.lus                 | 2 +-
 lustrec_tests/lustre_files/two_counters_e1_268.lus              | 2 +-
 lustrec_tests/lustre_files/two_counters_e2_3.lus                | 2 +-
 lustrec_tests/lustre_files/two_counters_e3_325.lus              | 2 +-
 lustrec_tests/lustre_files/two_counters_e7_222.lus              | 2 +-
 lustrec_tests/lustre_files/ums.lus                              | 2 +-
 lustrec_tests/lustre_files/ums_e7_1700.lus                      | 2 +-
 lustrec_tests/lustre_files/ums_e8_1032.lus                      | 2 +-
 910 files changed, 910 insertions(+), 910 deletions(-)

diff --git a/lustrec_tests/lustre_files/DRAGON_1.lus b/lustrec_tests/lustre_files/DRAGON_1.lus
index 9eca443b..c6c84b2b 100644
--- a/lustrec_tests/lustre_files/DRAGON_1.lus
+++ b/lustrec_tests/lustre_files/DRAGON_1.lus
@@ -92,7 +92,7 @@ let
    pre invalid;
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_1( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
          init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10.lus b/lustrec_tests/lustre_files/DRAGON_10.lus
index 3a5d625c..d6629812 100644
--- a/lustrec_tests/lustre_files/DRAGON_10.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10.lus
@@ -93,7 +93,7 @@ let
 tel
 
 -- Not provable with luke-bitvec
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10_e1_3587_e3_2749.lus b/lustrec_tests/lustre_files/DRAGON_10_e1_3587_e3_2749.lus
index 98e56420..71331d9c 100644
--- a/lustrec_tests/lustre_files/DRAGON_10_e1_3587_e3_2749.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10_e1_3587_e3_2749.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10_e1_3587_e3_2749( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10_e1_3587_e7_872.lus b/lustrec_tests/lustre_files/DRAGON_10_e1_3587_e7_872.lus
index d58998e9..056415d6 100644
--- a/lustrec_tests/lustre_files/DRAGON_10_e1_3587_e7_872.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10_e1_3587_e7_872.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10_e1_3587_e7_872( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10_e1_998.lus b/lustrec_tests/lustre_files/DRAGON_10_e1_998.lus
index 4f656dd1..5a7e3bce 100644
--- a/lustrec_tests/lustre_files/DRAGON_10_e1_998.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10_e1_998.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10_e1_998( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10_e2_2785_e3_1744.lus b/lustrec_tests/lustre_files/DRAGON_10_e2_2785_e3_1744.lus
index ea84210b..84e265ef 100644
--- a/lustrec_tests/lustre_files/DRAGON_10_e2_2785_e3_1744.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10_e2_2785_e3_1744.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10_e2_2785_e3_1744( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10_e2_402.lus b/lustrec_tests/lustre_files/DRAGON_10_e2_402.lus
index b93e428d..683bdd9a 100644
--- a/lustrec_tests/lustre_files/DRAGON_10_e2_402.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10_e2_402.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10_e2_402( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10_e3_144_e5_2046.lus b/lustrec_tests/lustre_files/DRAGON_10_e3_144_e5_2046.lus
index f423cfcb..047eceed 100644
--- a/lustrec_tests/lustre_files/DRAGON_10_e3_144_e5_2046.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10_e3_144_e5_2046.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10_e3_144_e5_2046( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10_e3_144_e7_523.lus b/lustrec_tests/lustre_files/DRAGON_10_e3_144_e7_523.lus
index 76ec74ab..c4ceaa4d 100644
--- a/lustrec_tests/lustre_files/DRAGON_10_e3_144_e7_523.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10_e3_144_e7_523.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10_e3_144_e7_523( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10_e3_3429.lus b/lustrec_tests/lustre_files/DRAGON_10_e3_3429.lus
index 5f48ee43..086b3d3e 100644
--- a/lustrec_tests/lustre_files/DRAGON_10_e3_3429.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10_e3_3429.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10_e3_3429( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10_e7_3861_e2_1020.lus b/lustrec_tests/lustre_files/DRAGON_10_e7_3861_e2_1020.lus
index 8d625d27..7f6d6d6e 100644
--- a/lustrec_tests/lustre_files/DRAGON_10_e7_3861_e2_1020.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10_e7_3861_e2_1020.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10_e7_3861_e2_1020( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_10_e7_3861_e7_2180.lus b/lustrec_tests/lustre_files/DRAGON_10_e7_3861_e7_2180.lus
index 5dab0ec1..f932adf4 100644
--- a/lustrec_tests/lustre_files/DRAGON_10_e7_3861_e7_2180.lus
+++ b/lustrec_tests/lustre_files/DRAGON_10_e7_3861_e7_2180.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_10_e7_3861_e7_2180( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_11.lus b/lustrec_tests/lustre_files/DRAGON_11.lus
index bc764177..8b1c9038 100644
--- a/lustrec_tests/lustre_files/DRAGON_11.lus
+++ b/lustrec_tests/lustre_files/DRAGON_11.lus
@@ -101,7 +101,7 @@ let
 tel
 
 -- Not provable?
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_11( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_11_e1_2450.lus b/lustrec_tests/lustre_files/DRAGON_11_e1_2450.lus
index 044e05aa..fa8166d7 100644
--- a/lustrec_tests/lustre_files/DRAGON_11_e1_2450.lus
+++ b/lustrec_tests/lustre_files/DRAGON_11_e1_2450.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_11_e1_2450( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e1_5887.lus b/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e1_5887.lus
index c6af53a7..07bebe5c 100644
--- a/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e1_5887.lus
+++ b/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e1_5887.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_11_e1_2450_e1_5887( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e2_1483.lus b/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e2_1483.lus
index 3514e048..ecc40a5c 100644
--- a/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e2_1483.lus
+++ b/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e2_1483.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_11_e1_2450_e2_1483( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e3_2330.lus b/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e3_2330.lus
index 3525675d..fe6b6e75 100644
--- a/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e3_2330.lus
+++ b/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e3_2330.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_11_e1_2450_e3_2330( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e7_5791.lus b/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e7_5791.lus
index 20367198..9d5821a4 100644
--- a/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e7_5791.lus
+++ b/lustrec_tests/lustre_files/DRAGON_11_e1_2450_e7_5791.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_11_e1_2450_e7_5791( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_11_e2_1678_e1_3565.lus b/lustrec_tests/lustre_files/DRAGON_11_e2_1678_e1_3565.lus
index 62dd4724..ae51f4d3 100644
--- a/lustrec_tests/lustre_files/DRAGON_11_e2_1678_e1_3565.lus
+++ b/lustrec_tests/lustre_files/DRAGON_11_e2_1678_e1_3565.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_11_e2_1678_e1_3565( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_11_e2_5396_e3_282.lus b/lustrec_tests/lustre_files/DRAGON_11_e2_5396_e3_282.lus
index a793ca4f..756c30f7 100644
--- a/lustrec_tests/lustre_files/DRAGON_11_e2_5396_e3_282.lus
+++ b/lustrec_tests/lustre_files/DRAGON_11_e2_5396_e3_282.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_11_e2_5396_e3_282( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_11_e3_382_e1_505.lus b/lustrec_tests/lustre_files/DRAGON_11_e3_382_e1_505.lus
index e9b45ce8..90c8d686 100644
--- a/lustrec_tests/lustre_files/DRAGON_11_e3_382_e1_505.lus
+++ b/lustrec_tests/lustre_files/DRAGON_11_e3_382_e1_505.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_11_e3_382_e1_505( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_11_e3_382_e4_4421.lus b/lustrec_tests/lustre_files/DRAGON_11_e3_382_e4_4421.lus
index c8b7faf8..4bc6614e 100644
--- a/lustrec_tests/lustre_files/DRAGON_11_e3_382_e4_4421.lus
+++ b/lustrec_tests/lustre_files/DRAGON_11_e3_382_e4_4421.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_11_e3_382_e4_4421( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_12.lus b/lustrec_tests/lustre_files/DRAGON_12.lus
index 8b57af81..ab65c8c7 100644
--- a/lustrec_tests/lustre_files/DRAGON_12.lus
+++ b/lustrec_tests/lustre_files/DRAGON_12.lus
@@ -101,7 +101,7 @@ let
 tel
 
 -- Only provable in nbac
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_12( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_12_e1_4640_e7_128.lus b/lustrec_tests/lustre_files/DRAGON_12_e1_4640_e7_128.lus
index 9f73a8c7..ce1c6bda 100644
--- a/lustrec_tests/lustre_files/DRAGON_12_e1_4640_e7_128.lus
+++ b/lustrec_tests/lustre_files/DRAGON_12_e1_4640_e7_128.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_12_e1_4640_e7_128( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_12_e2_1618.lus b/lustrec_tests/lustre_files/DRAGON_12_e2_1618.lus
index 567396e1..324b38c8 100644
--- a/lustrec_tests/lustre_files/DRAGON_12_e2_1618.lus
+++ b/lustrec_tests/lustre_files/DRAGON_12_e2_1618.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_12_e2_1618( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e1_6030.lus b/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e1_6030.lus
index 481df66d..ea0f986c 100644
--- a/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e1_6030.lus
+++ b/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e1_6030.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_12_e2_1618_e1_6030( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e2_138.lus b/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e2_138.lus
index 4b259b5d..c9daf454 100644
--- a/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e2_138.lus
+++ b/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e2_138.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_12_e2_1618_e2_138( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e3_2012.lus b/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e3_2012.lus
index 51a50a61..8dda840d 100644
--- a/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e3_2012.lus
+++ b/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e3_2012.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_12_e2_1618_e3_2012( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e7_4732.lus b/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e7_4732.lus
index cebf84d2..f38a6121 100644
--- a/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e7_4732.lus
+++ b/lustrec_tests/lustre_files/DRAGON_12_e2_1618_e7_4732.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_12_e2_1618_e7_4732( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_13.lus b/lustrec_tests/lustre_files/DRAGON_13.lus
index d722b231..d3991fbd 100644
--- a/lustrec_tests/lustre_files/DRAGON_13.lus
+++ b/lustrec_tests/lustre_files/DRAGON_13.lus
@@ -101,7 +101,7 @@ let
 tel
 
 -- Only provable in nbac
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_13( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_13_e3_1418_e3_2761.lus b/lustrec_tests/lustre_files/DRAGON_13_e3_1418_e3_2761.lus
index 0e34dc48..2cade6d8 100644
--- a/lustrec_tests/lustre_files/DRAGON_13_e3_1418_e3_2761.lus
+++ b/lustrec_tests/lustre_files/DRAGON_13_e3_1418_e3_2761.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_13_e3_1418_e3_2761( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_13_e7_2336.lus b/lustrec_tests/lustre_files/DRAGON_13_e7_2336.lus
index 709f18d0..ba59ceab 100644
--- a/lustrec_tests/lustre_files/DRAGON_13_e7_2336.lus
+++ b/lustrec_tests/lustre_files/DRAGON_13_e7_2336.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_13_e7_2336( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e1_541.lus b/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e1_541.lus
index 99195afe..a854151f 100644
--- a/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e1_541.lus
+++ b/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e1_541.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_13_e7_2336_e1_541( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e2_1255.lus b/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e2_1255.lus
index 085f7eeb..5fdb5f85 100644
--- a/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e2_1255.lus
+++ b/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e2_1255.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_13_e7_2336_e2_1255( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e3_3117.lus b/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e3_3117.lus
index d128d750..538ce9b0 100644
--- a/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e3_3117.lus
+++ b/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e3_3117.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_13_e7_2336_e3_3117( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e7_685.lus b/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e7_685.lus
index e50457c7..72c82548 100644
--- a/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e7_685.lus
+++ b/lustrec_tests/lustre_files/DRAGON_13_e7_2336_e7_685.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_13_e7_2336_e7_685( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_14.lus b/lustrec_tests/lustre_files/DRAGON_14.lus
index 816e0117..d0b5f4b0 100644
--- a/lustrec_tests/lustre_files/DRAGON_14.lus
+++ b/lustrec_tests/lustre_files/DRAGON_14.lus
@@ -101,7 +101,7 @@ let
 tel
 
 -- Not provable?
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_14( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_14_e1_5710.lus b/lustrec_tests/lustre_files/DRAGON_14_e1_5710.lus
index 4fc7ba7e..3c44be1e 100644
--- a/lustrec_tests/lustre_files/DRAGON_14_e1_5710.lus
+++ b/lustrec_tests/lustre_files/DRAGON_14_e1_5710.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_14_e1_5710( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_14_e2_3606.lus b/lustrec_tests/lustre_files/DRAGON_14_e2_3606.lus
index 62511e89..1967961c 100644
--- a/lustrec_tests/lustre_files/DRAGON_14_e2_3606.lus
+++ b/lustrec_tests/lustre_files/DRAGON_14_e2_3606.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_14_e2_3606( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_14_e3_1259_e1_5798.lus b/lustrec_tests/lustre_files/DRAGON_14_e3_1259_e1_5798.lus
index 6033ddfa..431395a1 100644
--- a/lustrec_tests/lustre_files/DRAGON_14_e3_1259_e1_5798.lus
+++ b/lustrec_tests/lustre_files/DRAGON_14_e3_1259_e1_5798.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_14_e3_1259_e1_5798( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_14_e3_5120.lus b/lustrec_tests/lustre_files/DRAGON_14_e3_5120.lus
index 25f01ba0..e0aca84e 100644
--- a/lustrec_tests/lustre_files/DRAGON_14_e3_5120.lus
+++ b/lustrec_tests/lustre_files/DRAGON_14_e3_5120.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_14_e3_5120( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_14_e7_3162.lus b/lustrec_tests/lustre_files/DRAGON_14_e7_3162.lus
index 02133366..5dc74481 100644
--- a/lustrec_tests/lustre_files/DRAGON_14_e7_3162.lus
+++ b/lustrec_tests/lustre_files/DRAGON_14_e7_3162.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_14_e7_3162( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e1_3998.lus b/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e1_3998.lus
index 7ff0f7d4..0523b86e 100644
--- a/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e1_3998.lus
+++ b/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e1_3998.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_14_e7_3162_e1_3998( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e2_753.lus b/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e2_753.lus
index 15a85bc5..a1941a75 100644
--- a/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e2_753.lus
+++ b/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e2_753.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_14_e7_3162_e2_753( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e3_4298.lus b/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e3_4298.lus
index 60c0fda7..737875e4 100644
--- a/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e3_4298.lus
+++ b/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e3_4298.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_14_e7_3162_e3_4298( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e7_3528.lus b/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e7_3528.lus
index 745be2de..d1d62b6a 100644
--- a/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e7_3528.lus
+++ b/lustrec_tests/lustre_files/DRAGON_14_e7_3162_e7_3528.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_14_e7_3162_e7_3528( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_1_e1_14612_e1_268_e7_501.lus b/lustrec_tests/lustre_files/DRAGON_1_e1_14612_e1_268_e7_501.lus
index 74bce00b..d534039e 100644
--- a/lustrec_tests/lustre_files/DRAGON_1_e1_14612_e1_268_e7_501.lus
+++ b/lustrec_tests/lustre_files/DRAGON_1_e1_14612_e1_268_e7_501.lus
@@ -80,7 +80,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_1_e1_14612_e1_268_e7_501( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
          init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_1_e1_14612_e2_2653_e7_4370.lus b/lustrec_tests/lustre_files/DRAGON_1_e1_14612_e2_2653_e7_4370.lus
index cb0d7a03..458a8e70 100644
--- a/lustrec_tests/lustre_files/DRAGON_1_e1_14612_e2_2653_e7_4370.lus
+++ b/lustrec_tests/lustre_files/DRAGON_1_e1_14612_e2_2653_e7_4370.lus
@@ -80,7 +80,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_1_e1_14612_e2_2653_e7_4370( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
          init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_1_e1_3184_e7_1888.lus b/lustrec_tests/lustre_files/DRAGON_1_e1_3184_e7_1888.lus
index f38a0475..6d2da214 100644
--- a/lustrec_tests/lustre_files/DRAGON_1_e1_3184_e7_1888.lus
+++ b/lustrec_tests/lustre_files/DRAGON_1_e1_3184_e7_1888.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_1_e1_3184_e7_1888( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
          init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_1_e1_5070.lus b/lustrec_tests/lustre_files/DRAGON_1_e1_5070.lus
index 7670834c..d34086b7 100644
--- a/lustrec_tests/lustre_files/DRAGON_1_e1_5070.lus
+++ b/lustrec_tests/lustre_files/DRAGON_1_e1_5070.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_1_e1_5070( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
          init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_1_e2_1997.lus b/lustrec_tests/lustre_files/DRAGON_1_e2_1997.lus
index 175b69ed..50fec2f0 100644
--- a/lustrec_tests/lustre_files/DRAGON_1_e2_1997.lus
+++ b/lustrec_tests/lustre_files/DRAGON_1_e2_1997.lus
@@ -80,7 +80,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_1_e2_1997( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
          init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_1_e2_1997_e7_3613_e2_3409.lus b/lustrec_tests/lustre_files/DRAGON_1_e2_1997_e7_3613_e2_3409.lus
index 58647e4e..70902162 100644
--- a/lustrec_tests/lustre_files/DRAGON_1_e2_1997_e7_3613_e2_3409.lus
+++ b/lustrec_tests/lustre_files/DRAGON_1_e2_1997_e7_3613_e2_3409.lus
@@ -80,7 +80,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_1_e2_1997_e7_3613_e2_3409( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
          init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_1_e3_11891_e7_4569_e4_4881.lus b/lustrec_tests/lustre_files/DRAGON_1_e3_11891_e7_4569_e4_4881.lus
index 74633e0f..8eacacb3 100644
--- a/lustrec_tests/lustre_files/DRAGON_1_e3_11891_e7_4569_e4_4881.lus
+++ b/lustrec_tests/lustre_files/DRAGON_1_e3_11891_e7_4569_e4_4881.lus
@@ -80,7 +80,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_1_e3_11891_e7_4569_e4_4881( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
          init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2.lus b/lustrec_tests/lustre_files/DRAGON_2.lus
index dbf20fbd..bd62f5fe 100644
--- a/lustrec_tests/lustre_files/DRAGON_2.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2.lus
@@ -92,7 +92,7 @@ let
    pre invalid;
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e1_2316.lus b/lustrec_tests/lustre_files/DRAGON_2_e1_2316.lus
index 511cea81..7924e93e 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e1_2316.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e1_2316.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e1_2316( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e1_2644.lus b/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e1_2644.lus
index 3d5402e1..78daf4fd 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e1_2644.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e1_2644.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e2_3183_e1_2644( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e2_3580.lus b/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e2_3580.lus
index 7c3c611b..3fd016f9 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e2_3580.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e2_3580.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e2_3183_e2_3580( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e3_5972.lus b/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e3_5972.lus
index b124e5aa..fd8da0b2 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e3_5972.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e2_3183_e3_5972.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e2_3183_e3_5972( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e2_4481.lus b/lustrec_tests/lustre_files/DRAGON_2_e2_4481.lus
index 7d1042e7..e376c9eb 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e2_4481.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e2_4481.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e2_4481( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e7_25.lus b/lustrec_tests/lustre_files/DRAGON_2_e7_25.lus
index c5c1edcc..e00b83f4 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e7_25.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e7_25.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e7_25( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e7_25_e1_154.lus b/lustrec_tests/lustre_files/DRAGON_2_e7_25_e1_154.lus
index 010be734..0f544022 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e7_25_e1_154.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e7_25_e1_154.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e7_25_e1_154( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e7_25_e2_5340.lus b/lustrec_tests/lustre_files/DRAGON_2_e7_25_e2_5340.lus
index 89c446f6..9fe741be 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e7_25_e2_5340.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e7_25_e2_5340.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e7_25_e2_5340( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e7_25_e3_829.lus b/lustrec_tests/lustre_files/DRAGON_2_e7_25_e3_829.lus
index 37eb05d2..9841cc9f 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e7_25_e3_829.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e7_25_e3_829.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e7_25_e3_829( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e7_25_e7_4469.lus b/lustrec_tests/lustre_files/DRAGON_2_e7_25_e7_4469.lus
index eb658495..623ed78a 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e7_25_e7_4469.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e7_25_e7_4469.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e7_25_e7_4469( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_2_e7_25_e8_3171.lus b/lustrec_tests/lustre_files/DRAGON_2_e7_25_e8_3171.lus
index f59ceb1b..465d8c3e 100644
--- a/lustrec_tests/lustre_files/DRAGON_2_e7_25_e8_3171.lus
+++ b/lustrec_tests/lustre_files/DRAGON_2_e7_25_e8_3171.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_2_e7_25_e8_3171( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3.lus b/lustrec_tests/lustre_files/DRAGON_3.lus
index 05973d13..2d64fec6 100644
--- a/lustrec_tests/lustre_files/DRAGON_3.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3.lus
@@ -100,7 +100,7 @@ let
    pre invalid;
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3_e1_4783.lus b/lustrec_tests/lustre_files/DRAGON_3_e1_4783.lus
index f5358d9d..58420965 100644
--- a/lustrec_tests/lustre_files/DRAGON_3_e1_4783.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3_e1_4783.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3_e1_4783( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e1_3755.lus b/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e1_3755.lus
index 4c23b900..0a790ae8 100644
--- a/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e1_3755.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e1_3755.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3_e1_4783_e1_3755( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e2_158.lus b/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e2_158.lus
index a5314027..24fb1542 100644
--- a/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e2_158.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e2_158.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3_e1_4783_e2_158( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e3_511.lus b/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e3_511.lus
index 029f4422..092186ee 100644
--- a/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e3_511.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e3_511.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3_e1_4783_e3_511( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e7_4070.lus b/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e7_4070.lus
index c5867517..ed081754 100644
--- a/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e7_4070.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3_e1_4783_e7_4070.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3_e1_4783_e7_4070( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3_e2_5343_e1_988.lus b/lustrec_tests/lustre_files/DRAGON_3_e2_5343_e1_988.lus
index 2dd1c5e6..c1bfe357 100644
--- a/lustrec_tests/lustre_files/DRAGON_3_e2_5343_e1_988.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3_e2_5343_e1_988.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3_e2_5343_e1_988( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3_e3_3846.lus b/lustrec_tests/lustre_files/DRAGON_3_e3_3846.lus
index c24841a6..8a0fbf6c 100644
--- a/lustrec_tests/lustre_files/DRAGON_3_e3_3846.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3_e3_3846.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3_e3_3846( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3_e3_5422_e1_2288.lus b/lustrec_tests/lustre_files/DRAGON_3_e3_5422_e1_2288.lus
index 10fd8825..c5fd76aa 100644
--- a/lustrec_tests/lustre_files/DRAGON_3_e3_5422_e1_2288.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3_e3_5422_e1_2288.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3_e3_5422_e1_2288( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3_e3_5422_e2_3135.lus b/lustrec_tests/lustre_files/DRAGON_3_e3_5422_e2_3135.lus
index 5e9428a0..35ce5c9f 100644
--- a/lustrec_tests/lustre_files/DRAGON_3_e3_5422_e2_3135.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3_e3_5422_e2_3135.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3_e3_5422_e2_3135( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_3_e7_4884.lus b/lustrec_tests/lustre_files/DRAGON_3_e7_4884.lus
index 10bc24b0..d770de43 100644
--- a/lustrec_tests/lustre_files/DRAGON_3_e7_4884.lus
+++ b/lustrec_tests/lustre_files/DRAGON_3_e7_4884.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_3_e7_4884( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4.lus b/lustrec_tests/lustre_files/DRAGON_4.lus
index 78ad4b17..3a01e161 100644
--- a/lustrec_tests/lustre_files/DRAGON_4.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4.lus
@@ -93,7 +93,7 @@ let
 tel
 
 -- Only provable with nbac
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e1_4312.lus b/lustrec_tests/lustre_files/DRAGON_4_e1_4312.lus
index b2370af7..f5f5140b 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e1_4312.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e1_4312.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e1_4312( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e2_2799.lus b/lustrec_tests/lustre_files/DRAGON_4_e2_2799.lus
index 6a7c1af3..867e43da 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e2_2799.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e2_2799.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e2_2799( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e1_1303.lus b/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e1_1303.lus
index 5098520c..68e577d0 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e1_1303.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e1_1303.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e2_2799_e1_1303( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e2_2251.lus b/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e2_2251.lus
index 46141130..357dd8a3 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e2_2251.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e2_2251.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e2_2799_e2_2251( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e3_1915.lus b/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e3_1915.lus
index 668832df..deca6ac9 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e3_1915.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e3_1915.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e2_2799_e3_1915( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e7_2499.lus b/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e7_2499.lus
index 25f5a22b..ccfe4b18 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e7_2499.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e2_2799_e7_2499.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e2_2799_e7_2499( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e3_1540_e1_5048.lus b/lustrec_tests/lustre_files/DRAGON_4_e3_1540_e1_5048.lus
index f3d56fef..50eb4ec2 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e3_1540_e1_5048.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e3_1540_e1_5048.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e3_1540_e1_5048( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e3_4133.lus b/lustrec_tests/lustre_files/DRAGON_4_e3_4133.lus
index 258ece4a..3d9a9160 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e3_4133.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e3_4133.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e3_4133( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e7_2329.lus b/lustrec_tests/lustre_files/DRAGON_4_e7_2329.lus
index b4f668df..90e6dbf8 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e7_2329.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e7_2329.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e7_2329( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e7_2329_e3_4574.lus b/lustrec_tests/lustre_files/DRAGON_4_e7_2329_e3_4574.lus
index df26a70b..c7896698 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e7_2329_e3_4574.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e7_2329_e3_4574.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e7_2329_e3_4574( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_4_e7_2329_e7_3856.lus b/lustrec_tests/lustre_files/DRAGON_4_e7_2329_e7_3856.lus
index 6e724710..ffd38752 100644
--- a/lustrec_tests/lustre_files/DRAGON_4_e7_2329_e7_3856.lus
+++ b/lustrec_tests/lustre_files/DRAGON_4_e7_2329_e7_3856.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_4_e7_2329_e7_3856( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_5.lus b/lustrec_tests/lustre_files/DRAGON_5.lus
index 56dfccf9..c6228130 100644
--- a/lustrec_tests/lustre_files/DRAGON_5.lus
+++ b/lustrec_tests/lustre_files/DRAGON_5.lus
@@ -93,7 +93,7 @@ let
 tel
 
 -- Only provable with nbac
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_5( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_5_e1_1835.lus b/lustrec_tests/lustre_files/DRAGON_5_e1_1835.lus
index cc8002a8..c109ef19 100644
--- a/lustrec_tests/lustre_files/DRAGON_5_e1_1835.lus
+++ b/lustrec_tests/lustre_files/DRAGON_5_e1_1835.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_5_e1_1835( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_5_e2_3018_e2_936.lus b/lustrec_tests/lustre_files/DRAGON_5_e2_3018_e2_936.lus
index 2e3cdf9c..be2d64d9 100644
--- a/lustrec_tests/lustre_files/DRAGON_5_e2_3018_e2_936.lus
+++ b/lustrec_tests/lustre_files/DRAGON_5_e2_3018_e2_936.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_5_e2_3018_e2_936( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_5_e7_2017.lus b/lustrec_tests/lustre_files/DRAGON_5_e7_2017.lus
index ce027e7a..8f8786ff 100644
--- a/lustrec_tests/lustre_files/DRAGON_5_e7_2017.lus
+++ b/lustrec_tests/lustre_files/DRAGON_5_e7_2017.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_5_e7_2017( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e1_5832.lus b/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e1_5832.lus
index fd127a41..b78b35fa 100644
--- a/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e1_5832.lus
+++ b/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e1_5832.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_5_e7_2017_e1_5832( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e2_664.lus b/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e2_664.lus
index 35593746..a467f904 100644
--- a/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e2_664.lus
+++ b/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e2_664.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_5_e7_2017_e2_664( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e3_1763.lus b/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e3_1763.lus
index 274024e4..ee8ea0df 100644
--- a/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e3_1763.lus
+++ b/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e3_1763.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_5_e7_2017_e3_1763( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e7_2326.lus b/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e7_2326.lus
index c31ee961..ce00b691 100644
--- a/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e7_2326.lus
+++ b/lustrec_tests/lustre_files/DRAGON_5_e7_2017_e7_2326.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_5_e7_2017_e7_2326( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_6.lus b/lustrec_tests/lustre_files/DRAGON_6.lus
index ff8e404b..4bee7774 100644
--- a/lustrec_tests/lustre_files/DRAGON_6.lus
+++ b/lustrec_tests/lustre_files/DRAGON_6.lus
@@ -92,7 +92,7 @@ let
    pre invalid;
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_6( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_6_e7_5046_e7_3623.lus b/lustrec_tests/lustre_files/DRAGON_6_e7_5046_e7_3623.lus
index a741802b..495e39e2 100644
--- a/lustrec_tests/lustre_files/DRAGON_6_e7_5046_e7_3623.lus
+++ b/lustrec_tests/lustre_files/DRAGON_6_e7_5046_e7_3623.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_6_e7_5046_e7_3623( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_7.lus b/lustrec_tests/lustre_files/DRAGON_7.lus
index dcdd3f5e..4d75e4f3 100644
--- a/lustrec_tests/lustre_files/DRAGON_7.lus
+++ b/lustrec_tests/lustre_files/DRAGON_7.lus
@@ -93,7 +93,7 @@ let
 tel
 
 -- Not provable with luke-bitvec
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_7( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_7_e2_2872_e2_5844.lus b/lustrec_tests/lustre_files/DRAGON_7_e2_2872_e2_5844.lus
index 44a20854..1383b965 100644
--- a/lustrec_tests/lustre_files/DRAGON_7_e2_2872_e2_5844.lus
+++ b/lustrec_tests/lustre_files/DRAGON_7_e2_2872_e2_5844.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_7_e2_2872_e2_5844( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_7_e2_2872_e3_2640.lus b/lustrec_tests/lustre_files/DRAGON_7_e2_2872_e3_2640.lus
index 27c4fa98..6aa0a988 100644
--- a/lustrec_tests/lustre_files/DRAGON_7_e2_2872_e3_2640.lus
+++ b/lustrec_tests/lustre_files/DRAGON_7_e2_2872_e3_2640.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_7_e2_2872_e3_2640( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_7_e7_3157_e2_2082.lus b/lustrec_tests/lustre_files/DRAGON_7_e7_3157_e2_2082.lus
index a30884b5..7f44a2d1 100644
--- a/lustrec_tests/lustre_files/DRAGON_7_e7_3157_e2_2082.lus
+++ b/lustrec_tests/lustre_files/DRAGON_7_e7_3157_e2_2082.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_7_e7_3157_e2_2082( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_8.lus b/lustrec_tests/lustre_files/DRAGON_8.lus
index 830fc1ae..e7fee7cd 100644
--- a/lustrec_tests/lustre_files/DRAGON_8.lus
+++ b/lustrec_tests/lustre_files/DRAGON_8.lus
@@ -93,7 +93,7 @@ let
 tel
 
 -- Only provable with nbac
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_8( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_8_e2_3896_e3_3125.lus b/lustrec_tests/lustre_files/DRAGON_8_e2_3896_e3_3125.lus
index ff09055f..1abe9e99 100644
--- a/lustrec_tests/lustre_files/DRAGON_8_e2_3896_e3_3125.lus
+++ b/lustrec_tests/lustre_files/DRAGON_8_e2_3896_e3_3125.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_8_e2_3896_e3_3125( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_8_e3_786.lus b/lustrec_tests/lustre_files/DRAGON_8_e3_786.lus
index 68ab5e49..4c998a13 100644
--- a/lustrec_tests/lustre_files/DRAGON_8_e3_786.lus
+++ b/lustrec_tests/lustre_files/DRAGON_8_e3_786.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_8_e3_786( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_8_e3_786_e7_4541.lus b/lustrec_tests/lustre_files/DRAGON_8_e3_786_e7_4541.lus
index c7edf171..805c0d5e 100644
--- a/lustrec_tests/lustre_files/DRAGON_8_e3_786_e7_4541.lus
+++ b/lustrec_tests/lustre_files/DRAGON_8_e3_786_e7_4541.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_8_e3_786_e7_4541( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_8_e7_3752.lus b/lustrec_tests/lustre_files/DRAGON_8_e7_3752.lus
index b00629c0..dcc11b0f 100644
--- a/lustrec_tests/lustre_files/DRAGON_8_e7_3752.lus
+++ b/lustrec_tests/lustre_files/DRAGON_8_e7_3752.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_8_e7_3752( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_9.lus b/lustrec_tests/lustre_files/DRAGON_9.lus
index 36ff872d..9aebf143 100644
--- a/lustrec_tests/lustre_files/DRAGON_9.lus
+++ b/lustrec_tests/lustre_files/DRAGON_9.lus
@@ -93,7 +93,7 @@ let
 tel
 
 -- Not provable with luke-bitvec
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_9( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_9_e7_1843.lus b/lustrec_tests/lustre_files/DRAGON_9_e7_1843.lus
index 2513d5f3..15be3d84 100644
--- a/lustrec_tests/lustre_files/DRAGON_9_e7_1843.lus
+++ b/lustrec_tests/lustre_files/DRAGON_9_e7_1843.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_9_e7_1843( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e1_5434.lus b/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e1_5434.lus
index 08e22a9b..7f0cf3bf 100644
--- a/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e1_5434.lus
+++ b/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e1_5434.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_9_e7_1843_e1_5434( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e2_1145.lus b/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e2_1145.lus
index db6c9c00..e6eb8437 100644
--- a/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e2_1145.lus
+++ b/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e2_1145.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_9_e7_1843_e2_1145( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e3_5316.lus b/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e3_5316.lus
index 013eef2b..f47720a5 100644
--- a/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e3_5316.lus
+++ b/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e3_5316.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_9_e7_1843_e3_5316( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e7_2225.lus b/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e7_2225.lus
index 2805d709..10b80b70 100644
--- a/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e7_2225.lus
+++ b/lustrec_tests/lustre_files/DRAGON_9_e7_1843_e7_2225.lus
@@ -81,7 +81,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_9_e7_1843_e7_2225( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int ) returns ( OK : bool );
 --@ contract guarantee OK;
     var exclusive, shared, shared_dirty, dirty, invalid : int;
diff --git a/lustrec_tests/lustre_files/DRAGON_all.lus b/lustrec_tests/lustre_files/DRAGON_all.lus
index eace68f4..1e8b3068 100644
--- a/lustrec_tests/lustre_files/DRAGON_all.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all.lus
@@ -100,7 +100,7 @@ let
    pre invalid;
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2.lus b/lustrec_tests/lustre_files/DRAGON_all2.lus
index 899093ed..48a265a2 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2.lus
@@ -100,7 +100,7 @@ let
    pre invalid;
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e2_2073_e8_3691.lus b/lustrec_tests/lustre_files/DRAGON_all2_e2_2073_e8_3691.lus
index 6aa49246..7c189059 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e2_2073_e8_3691.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e2_2073_e8_3691.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e2_2073_e8_3691( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e1_6463.lus b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e1_6463.lus
index b44a88a1..7e533bf1 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e1_6463.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e1_6463.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e3_4612_e1_6463( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e2_5774.lus b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e2_5774.lus
index 3dcc2784..52cbf727 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e2_5774.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e2_5774.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e3_4612_e2_5774( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e3_1543.lus b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e3_1543.lus
index 61ab6aee..c4d3d23c 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e3_1543.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e3_1543.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e3_4612_e3_1543( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e4_3719.lus b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e4_3719.lus
index 00573fc3..df93374b 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e4_3719.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e4_3719.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e3_4612_e4_3719( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e5_3642.lus b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e5_3642.lus
index bff64ce6..8f8bc746 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e5_3642.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e5_3642.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e3_4612_e5_3642( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e8_5861.lus b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e8_5861.lus
index 7fd779d7..a5ab257c 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e8_5861.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e3_4612_e8_5861.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e3_4612_e8_5861( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e7_5406.lus b/lustrec_tests/lustre_files/DRAGON_all2_e7_5406.lus
index 5b758cf0..50e91094 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e7_5406.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e7_5406.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e7_5406( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e1_6690.lus b/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e1_6690.lus
index fbed604d..9b18e179 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e1_6690.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e1_6690.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e7_5406_e1_6690( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e2_3084.lus b/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e2_3084.lus
index e5719211..056d33d8 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e2_3084.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e2_3084.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e7_5406_e2_3084( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e3_506.lus b/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e3_506.lus
index f4658185..5457cb4a 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e3_506.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e3_506.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e7_5406_e3_506( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e7_6697.lus b/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e7_6697.lus
index 70557688..6cfbd412 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e7_6697.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e7_5406_e7_6697.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e7_5406_e7_6697( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e8_4626.lus b/lustrec_tests/lustre_files/DRAGON_all2_e8_4626.lus
index f390eeb1..5db922a8 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e8_4626.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e8_4626.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e8_4626( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e8_5504.lus b/lustrec_tests/lustre_files/DRAGON_all2_e8_5504.lus
index f390eeb1..710c8fdd 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e8_5504.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e8_5504.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e8_5504( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e1_4719.lus b/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e1_4719.lus
index 50df6052..cb54da44 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e1_4719.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e1_4719.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e8_5504_e1_4719( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e2_1598.lus b/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e2_1598.lus
index 6aa49246..a3b90e14 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e2_1598.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e2_1598.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e8_5504_e2_1598( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e7_579.lus b/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e7_579.lus
index 702bf3ae..ac8d430a 100644
--- a/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e7_579.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all2_e8_5504_e7_579.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all2_e8_5504_e7_579( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK: bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e1_1759.lus b/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e1_1759.lus
index 9f75bcd8..42b5941c 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e1_1759.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e1_1759.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e1_4022_e1_1759( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e2_267.lus b/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e2_267.lus
index 5025b27f..1c5026c7 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e2_267.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e2_267.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e1_4022_e2_267( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e3_3628.lus b/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e3_3628.lus
index bd89765c..6af2481d 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e3_3628.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e3_3628.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e1_4022_e3_3628( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e7_2886.lus b/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e7_2886.lus
index 307aec8c..5e6da023 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e7_2886.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e1_4022_e7_2886.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e1_4022_e7_2886( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e1_4037.lus b/lustrec_tests/lustre_files/DRAGON_all_e1_4037.lus
index cba703d5..a7aaf0c6 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e1_4037.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e1_4037.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e1_4037( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e2_6104.lus b/lustrec_tests/lustre_files/DRAGON_all_e2_6104.lus
index 09fb573c..1566416d 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e2_6104.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e2_6104.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e2_6104( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e1_6205.lus b/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e1_6205.lus
index 732c6608..60a2bd0f 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e1_6205.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e1_6205.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e2_6104_e1_6205( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e2_3308.lus b/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e2_3308.lus
index b1583ee0..cd92da89 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e2_3308.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e2_3308.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e2_6104_e2_3308( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e3_2607.lus b/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e3_2607.lus
index d9203e6d..d1058068 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e3_2607.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e2_6104_e3_2607.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e2_6104_e3_2607( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e1_1318.lus b/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e1_1318.lus
index dddaf0fb..0eb716d2 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e1_1318.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e1_1318.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e3_4821_e1_1318( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e2_1089.lus b/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e2_1089.lus
index 835e5865..34c2b860 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e2_1089.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e2_1089.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e3_4821_e2_1089( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e4_1791.lus b/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e4_1791.lus
index 9dcd1c0c..58914d15 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e4_1791.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e4_1791.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e3_4821_e4_1791( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e5_1536.lus b/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e5_1536.lus
index 4dc048d3..10990718 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e5_1536.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e3_4821_e5_1536.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e3_4821_e5_1536( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e3_5957.lus b/lustrec_tests/lustre_files/DRAGON_all_e3_5957.lus
index 08f4bbeb..3a221e1d 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e3_5957.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e3_5957.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e3_5957( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e7_1941_e2_6086.lus b/lustrec_tests/lustre_files/DRAGON_all_e7_1941_e2_6086.lus
index 949f9dd7..94635ba7 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e7_1941_e2_6086.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e7_1941_e2_6086.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e7_1941_e2_6086( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/DRAGON_all_e7_4065.lus b/lustrec_tests/lustre_files/DRAGON_all_e7_4065.lus
index 92a6ae9b..c08a90ff 100644
--- a/lustrec_tests/lustre_files/DRAGON_all_e7_4065.lus
+++ b/lustrec_tests/lustre_files/DRAGON_all_e7_4065.lus
@@ -85,7 +85,7 @@ let
    if(e12) then if(g12) then pre invalid+1 else pre invalid else 
    pre invalid;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
+node DRAGON_all_e7_4065( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool;
              init_invalid : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/FIREFLY_1.lus b/lustrec_tests/lustre_files/FIREFLY_1.lus
index 1b1d6588..42ce4e95 100644
--- a/lustrec_tests/lustre_files/FIREFLY_1.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_1.lus
@@ -72,7 +72,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_1(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_10.lus b/lustrec_tests/lustre_files/FIREFLY_10.lus
index 32b524d8..b2b53fb7 100644
--- a/lustrec_tests/lustre_files/FIREFLY_10.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_10.lus
@@ -73,7 +73,7 @@ let
 tel
 
 -- Not provable in luke-bitvec
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_10(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_10_e7_919_e2_3192.lus b/lustrec_tests/lustre_files/FIREFLY_10_e7_919_e2_3192.lus
index 284efd0b..60655923 100644
--- a/lustrec_tests/lustre_files/FIREFLY_10_e7_919_e2_3192.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_10_e7_919_e2_3192.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_10_e7_919_e2_3192(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_11.lus b/lustrec_tests/lustre_files/FIREFLY_11.lus
index ef9e8482..3f9a72fd 100644
--- a/lustrec_tests/lustre_files/FIREFLY_11.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_11.lus
@@ -73,7 +73,7 @@ let
 tel
 
 -- Only provable in nbac
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_11(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_11_e1_3457.lus b/lustrec_tests/lustre_files/FIREFLY_11_e1_3457.lus
index 4c87d333..df75c0d1 100644
--- a/lustrec_tests/lustre_files/FIREFLY_11_e1_3457.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_11_e1_3457.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_11_e1_3457(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_11_e3_2076_e1_1270.lus b/lustrec_tests/lustre_files/FIREFLY_11_e3_2076_e1_1270.lus
index 74eb306d..3425c0a7 100644
--- a/lustrec_tests/lustre_files/FIREFLY_11_e3_2076_e1_1270.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_11_e3_2076_e1_1270.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_11_e3_2076_e1_1270(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_1_e1_1092.lus b/lustrec_tests/lustre_files/FIREFLY_1_e1_1092.lus
index 505b95c9..37ad548a 100644
--- a/lustrec_tests/lustre_files/FIREFLY_1_e1_1092.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_1_e1_1092.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_1_e1_1092(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e1_1486.lus b/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e1_1486.lus
index 7cfbebf7..d42037b3 100644
--- a/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e1_1486.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e1_1486.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_1_e1_1092_e1_1486(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e2_1853.lus b/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e2_1853.lus
index 54f6228a..cf71a5cf 100644
--- a/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e2_1853.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e2_1853.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_1_e1_1092_e2_1853(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e3_389.lus b/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e3_389.lus
index 288cf5da..1e306350 100644
--- a/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e3_389.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e3_389.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_1_e1_1092_e3_389(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e7_1119.lus b/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e7_1119.lus
index 5d490931..cb9b1da6 100644
--- a/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e7_1119.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_1_e1_1092_e7_1119.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_1_e1_1092_e7_1119(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_2.lus b/lustrec_tests/lustre_files/FIREFLY_2.lus
index bfa923eb..ab04d74c 100644
--- a/lustrec_tests/lustre_files/FIREFLY_2.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_2.lus
@@ -80,7 +80,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int)
+node FIREFLY_2(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int)
         returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_2_e3_151_e3_1540.lus b/lustrec_tests/lustre_files/FIREFLY_2_e3_151_e3_1540.lus
index 1960ded0..f4c47c9f 100644
--- a/lustrec_tests/lustre_files/FIREFLY_2_e3_151_e3_1540.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_2_e3_151_e3_1540.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int)
+node FIREFLY_2_e3_151_e3_1540(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int)
         returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_3.lus b/lustrec_tests/lustre_files/FIREFLY_3.lus
index 6f4d84e6..600adf9b 100644
--- a/lustrec_tests/lustre_files/FIREFLY_3.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_3.lus
@@ -81,7 +81,7 @@ let
 tel
 
 -- Not provable in luke-bitvec
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_3(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_3_e2_2236.lus b/lustrec_tests/lustre_files/FIREFLY_3_e2_2236.lus
index 54cf49a2..e00b96ef 100644
--- a/lustrec_tests/lustre_files/FIREFLY_3_e2_2236.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_3_e2_2236.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_3_e2_2236(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e1_2305.lus b/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e1_2305.lus
index 3dae3b0e..2d8fb0ab 100644
--- a/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e1_2305.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e1_2305.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_3_e2_2236_e1_2305(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e2_1058.lus b/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e2_1058.lus
index 58c31761..fe253323 100644
--- a/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e2_1058.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e2_1058.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_3_e2_2236_e2_1058(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e3_2657.lus b/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e3_2657.lus
index 9a8c8175..6d8127b3 100644
--- a/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e3_2657.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e3_2657.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_3_e2_2236_e3_2657(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e7_3681.lus b/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e7_3681.lus
index 0fdb5090..f49835a1 100644
--- a/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e7_3681.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_3_e2_2236_e7_3681.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_3_e2_2236_e7_3681(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_4.lus b/lustrec_tests/lustre_files/FIREFLY_4.lus
index b60e4ba5..438d8106 100644
--- a/lustrec_tests/lustre_files/FIREFLY_4.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_4.lus
@@ -80,7 +80,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_4(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511.lus b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511.lus
index 290a29b2..318312cc 100644
--- a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_4_e3_3511(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e1_2375.lus b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e1_2375.lus
index 19121ced..bc9a87a7 100644
--- a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e1_2375.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e1_2375.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_4_e3_3511_e1_2375(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e2_1923.lus b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e2_1923.lus
index f014fb3f..0b1d3cf7 100644
--- a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e2_1923.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e2_1923.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_4_e3_3511_e2_1923(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e3_422.lus b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e3_422.lus
index 86552d04..91470b52 100644
--- a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e3_422.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e3_422.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_4_e3_3511_e3_422(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e4_1464.lus b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e4_1464.lus
index e68ac00a..a6148367 100644
--- a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e4_1464.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e4_1464.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_4_e3_3511_e4_1464(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e5_3248.lus b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e5_3248.lus
index b330bd5b..a5ca0f46 100644
--- a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e5_3248.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e5_3248.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_4_e3_3511_e5_3248(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e7_3568.lus b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e7_3568.lus
index e61184cc..7dd53f1d 100644
--- a/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e7_3568.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_4_e3_3511_e7_3568.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_4_e3_3511_e7_3568(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_5.lus b/lustrec_tests/lustre_files/FIREFLY_5.lus
index e854b885..3647cc5d 100644
--- a/lustrec_tests/lustre_files/FIREFLY_5.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_5.lus
@@ -73,7 +73,7 @@ let
 tel
 
 -- Not provable in luke-bitvec
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_5(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_5_e1_2552_e7_1169.lus b/lustrec_tests/lustre_files/FIREFLY_5_e1_2552_e7_1169.lus
index 2666f254..ac28f51c 100644
--- a/lustrec_tests/lustre_files/FIREFLY_5_e1_2552_e7_1169.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_5_e1_2552_e7_1169.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_5_e1_2552_e7_1169(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_5_e2_2229.lus b/lustrec_tests/lustre_files/FIREFLY_5_e2_2229.lus
index 9a307a7f..891e1258 100644
--- a/lustrec_tests/lustre_files/FIREFLY_5_e2_2229.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_5_e2_2229.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_5_e2_2229(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_5_e2_2884.lus b/lustrec_tests/lustre_files/FIREFLY_5_e2_2884.lus
index 9a307a7f..79b240e3 100644
--- a/lustrec_tests/lustre_files/FIREFLY_5_e2_2884.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_5_e2_2884.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_5_e2_2884(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e1_2678.lus b/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e1_2678.lus
index 2f1de3c5..f7c4dcb3 100644
--- a/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e1_2678.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e1_2678.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_5_e2_2884_e1_2678(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e2_1492.lus b/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e2_1492.lus
index d6a63e76..8c178a11 100644
--- a/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e2_1492.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e2_1492.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_5_e2_2884_e2_1492(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e3_1882.lus b/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e3_1882.lus
index 259ce112..cf20153b 100644
--- a/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e3_1882.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e3_1882.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_5_e2_2884_e3_1882(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e7_3594.lus b/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e7_3594.lus
index 939fb89e..c0173d70 100644
--- a/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e7_3594.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_5_e2_2884_e7_3594.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_5_e2_2884_e7_3594(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_6.lus b/lustrec_tests/lustre_files/FIREFLY_6.lus
index 281159ff..47f6a3e4 100644
--- a/lustrec_tests/lustre_files/FIREFLY_6.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_6.lus
@@ -73,7 +73,7 @@ let
 tel
 
 -- Only provable in nbac
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_6(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_6_e2_3302.lus b/lustrec_tests/lustre_files/FIREFLY_6_e2_3302.lus
index ff72b630..296260a4 100644
--- a/lustrec_tests/lustre_files/FIREFLY_6_e2_3302.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_6_e2_3302.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_6_e2_3302(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_7.lus b/lustrec_tests/lustre_files/FIREFLY_7.lus
index 59576d47..00ef65ce 100644
--- a/lustrec_tests/lustre_files/FIREFLY_7.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_7.lus
@@ -81,7 +81,7 @@ let
 tel
 
 -- Only provable in nbac
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_7(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_8.lus b/lustrec_tests/lustre_files/FIREFLY_8.lus
index 1bf612ae..f55d15dc 100644
--- a/lustrec_tests/lustre_files/FIREFLY_8.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_8.lus
@@ -72,7 +72,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_8(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_8_e2_1711.lus b/lustrec_tests/lustre_files/FIREFLY_8_e2_1711.lus
index e40fe58e..0f94b790 100644
--- a/lustrec_tests/lustre_files/FIREFLY_8_e2_1711.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_8_e2_1711.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_8_e2_1711(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e1_1489.lus b/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e1_1489.lus
index cbd852e3..69051193 100644
--- a/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e1_1489.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e1_1489.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_8_e2_1711_e1_1489(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e2_2673.lus b/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e2_2673.lus
index da4f57a9..8f807f8d 100644
--- a/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e2_2673.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e2_2673.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_8_e2_1711_e2_2673(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e3_1753.lus b/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e3_1753.lus
index d5a6332a..137acf8b 100644
--- a/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e3_1753.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e3_1753.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_8_e2_1711_e3_1753(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e7_1962.lus b/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e7_1962.lus
index 25a9e4c2..e5f2c57c 100644
--- a/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e7_1962.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_8_e2_1711_e7_1962.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_8_e2_1711_e7_1962(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_9.lus b/lustrec_tests/lustre_files/FIREFLY_9.lus
index 2c70da55..9b930c55 100644
--- a/lustrec_tests/lustre_files/FIREFLY_9.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_9.lus
@@ -80,7 +80,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_9(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_9_e7_170_e3_3647.lus b/lustrec_tests/lustre_files/FIREFLY_9_e7_170_e3_3647.lus
index 04f4b7eb..dca85655 100644
--- a/lustrec_tests/lustre_files/FIREFLY_9_e7_170_e3_3647.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_9_e7_170_e3_3647.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_9_e7_170_e3_3647(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3.lus b/lustrec_tests/lustre_files/FIREFLY_a3.lus
index b2989e34..6822cdad 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3.lus
@@ -80,7 +80,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233.lus
index 49aeaa3c..39bf3d37 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e1_3233(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e1_3123.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e1_3123.lus
index 10014ceb..464236b9 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e1_3123.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e1_3123.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e1_3233_e1_3123(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e2_2392.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e2_2392.lus
index 885bd8bb..187e714e 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e2_2392.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e2_2392.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e1_3233_e2_2392(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e3_2970.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e3_2970.lus
index 4713f8f7..4327b8f8 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e3_2970.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e3_2970.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e1_3233_e3_2970(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e7_906.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e7_906.lus
index 846f24c6..a30d90d7 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e7_906.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e1_3233_e7_906.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e1_3233_e7_906(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e1_3235.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e1_3235.lus
index 215db0a0..70794595 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e1_3235.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e1_3235.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e2_2086_e1_3235(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e2_2689.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e2_2689.lus
index 22ea7851..31e3fcfa 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e2_2689.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e2_2689.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e2_2086_e2_2689(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e3_2542.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e3_2542.lus
index 264163f1..e0d37467 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e3_2542.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e3_2542.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e2_2086_e3_2542(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e7_2614.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e7_2614.lus
index 28e56f7e..f9af10ab 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e7_2614.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e2_2086_e7_2614.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e2_2086_e7_2614(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e2_2952.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e2_2952.lus
index 18d65e94..0065c18f 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e2_2952.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e2_2952.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e2_2952(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e1_1979.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e1_1979.lus
index da16baf0..d569a966 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e1_1979.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e1_1979.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e3_314_e1_1979(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e2_2812.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e2_2812.lus
index 6f1cc5ac..b223857d 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e2_2812.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e2_2812.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e3_314_e2_2812(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e4_897.lus b/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e4_897.lus
index 17643a05..59abfa43 100644
--- a/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e4_897.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_a3_e3_314_e4_897.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_a3_e3_314_e4_897(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all.lus b/lustrec_tests/lustre_files/FIREFLY_all.lus
index 74bab4f8..4fa51477 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all.lus
@@ -80,7 +80,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e1_1201.lus b/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e1_1201.lus
index c9c8556b..2aae990d 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e1_1201.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e1_1201.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e1_1207_e1_1201(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e2_3220.lus b/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e2_3220.lus
index 24057f2a..95a9483f 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e2_3220.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e2_3220.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e1_1207_e2_3220(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e3_1928.lus b/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e3_1928.lus
index b2c6408c..b607b9cb 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e3_1928.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e3_1928.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e1_1207_e3_1928(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e7_156.lus b/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e7_156.lus
index cb4427cb..2d9175e9 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e7_156.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e1_1207_e7_156.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e1_1207_e7_156(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e1_3406.lus b/lustrec_tests/lustre_files/FIREFLY_all_e1_3406.lus
index 0666bb64..475cd4ab 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e1_3406.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e1_3406.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e1_3406(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e1_768.lus b/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e1_768.lus
index b8038eb9..b04247da 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e1_768.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e1_768.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e2_2924_e1_768(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e2_1767.lus b/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e2_1767.lus
index 4740f353..8ca7ff92 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e2_1767.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e2_1767.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e2_2924_e2_1767(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e3_3946.lus b/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e3_3946.lus
index 900e4ae2..900c214a 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e3_3946.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e3_3946.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e2_2924_e3_3946(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e7_3371.lus b/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e7_3371.lus
index 4e016ab0..4010843f 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e7_3371.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e2_2924_e7_3371.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e2_2924_e7_3371(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e2_3678.lus b/lustrec_tests/lustre_files/FIREFLY_all_e2_3678.lus
index 7c1b86d9..9c0d7e66 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e2_3678.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e2_3678.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e2_3678(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e1_667.lus b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e1_667.lus
index 70725063..5dc4ff5b 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e1_667.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e1_667.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e3_1600_e1_667(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e2_676.lus b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e2_676.lus
index 270f0730..06346e88 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e2_676.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e2_676.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e3_1600_e2_676(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e3_2055.lus b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e3_2055.lus
index 59038d86..88bd29d1 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e3_2055.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e3_2055.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e3_1600_e3_2055(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e4_2415.lus b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e4_2415.lus
index 102536fe..c3385773 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e4_2415.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e4_2415.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e3_1600_e4_2415(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e5_84.lus b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e5_84.lus
index dc66ec42..fcbcb160 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e5_84.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e5_84.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e3_1600_e5_84(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e7_1607.lus b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e7_1607.lus
index b9b2de24..f105de54 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e7_1607.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e3_1600_e7_1607.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e3_1600_e7_1607(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e3_3496.lus b/lustrec_tests/lustre_files/FIREFLY_all_e3_3496.lus
index c9cfd38d..ec06371f 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e3_3496.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e3_3496.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e3_3496(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_all_e7_1909.lus b/lustrec_tests/lustre_files/FIREFLY_all_e7_1909.lus
index 58d576b8..682f22de 100644
--- a/lustrec_tests/lustre_files/FIREFLY_all_e7_1909.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_all_e7_1909.lus
@@ -63,7 +63,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_all_e7_1909(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1a.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1a.lus
index 80333baa..a43adfac 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1a.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1a.lus
@@ -75,7 +75,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1a(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e1_2924.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e1_2924.lus
index c6d753c1..99fb0915 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e1_2924.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e1_2924.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1a_e2_284_e1_2924(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e2_2755.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e2_2755.lus
index 8d5ead6a..49731bc9 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e2_2755.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e2_2755.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1a_e2_284_e2_2755(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e3_3091.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e3_3091.lus
index 7ccda947..d73dae1e 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e3_3091.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e3_3091.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1a_e2_284_e3_3091(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e7_998.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e7_998.lus
index 2aac0499..bb3283ec 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e7_998.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1a_e2_284_e7_998.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1a_e2_284_e7_998(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1a_e7_3042_e3_1213.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1a_e7_3042_e3_1213.lus
index 291aae9e..a618a830 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1a_e7_3042_e3_1213.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1a_e7_3042_e3_1213.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1a_e7_3042_e3_1213(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b.lus
index 4b4f0f6e..5a3fe52b 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b.lus
@@ -75,7 +75,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e1_1565.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e1_1565.lus
index 619781c8..3de60a1c 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e1_1565.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e1_1565.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e1_1139_e1_1565(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e2_2893.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e2_2893.lus
index a16e823b..1f3e0728 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e2_2893.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e2_2893.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e1_1139_e2_2893(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e3_1839.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e3_1839.lus
index 62cd5f52..458a7ccb 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e3_1839.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1139_e3_1839.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e1_1139_e3_1839(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1691.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1691.lus
index 7ac6555d..fbb1fd6a 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1691.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e1_1691.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e1_1691(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049.lus
index 02cc9057..4c59d860 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e2_3049(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e1_946.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e1_946.lus
index 99964953..558f7b56 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e1_946.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e1_946.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e2_3049_e1_946(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e2_698.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e2_698.lus
index 561330cd..2540096e 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e2_698.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e2_698.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e2_3049_e2_698(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e3_2697.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e3_2697.lus
index af6e370a..39b4bd00 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e3_2697.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e2_3049_e3_2697.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e2_3049_e3_2697(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671.lus
index 45b696b4..66b1c18d 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e3_671(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e1_725.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e1_725.lus
index 723d9620..cd6c084c 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e1_725.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e1_725.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e3_671_e1_725(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e2_2131.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e2_2131.lus
index 94b736b8..520d798f 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e2_2131.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e2_2131.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e3_671_e2_2131(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e3_941.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e3_941.lus
index 5cff53bf..3ba3531c 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e3_941.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e3_941.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e3_671_e3_941(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e4_147.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e4_147.lus
index 105019ab..a0150bc2 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e4_147.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e4_147.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e3_671_e4_147(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e5_1637.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e5_1637.lus
index 55556a66..b3e22150 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e5_1637.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e5_1637.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e3_671_e5_1637(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e6_1974.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e6_1974.lus
index 030326ed..8824c315 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e6_1974.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e6_1974.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e3_671_e6_1974(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e7_1882.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e7_1882.lus
index 52271663..08c8df2a 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e7_1882.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e3_671_e7_1882.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e3_671_e7_1882(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_2574.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_2574.lus
index 46719553..51776f2a 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_2574.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_2574.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e7_2574(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191.lus
index 46719553..7d3c1b37 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e7_3191(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e1_1303.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e1_1303.lus
index 660c27ef..be683c23 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e1_1303.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e1_1303.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e7_3191_e1_1303(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e2_1864.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e2_1864.lus
index a2c07325..e8cbdcfd 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e2_1864.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e2_1864.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e7_3191_e2_1864(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e3_1250.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e3_1250.lus
index 52271663..1f7354fe 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e3_1250.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e3_1250.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e7_3191_e3_1250(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e7_2146.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e7_2146.lus
index 442b4ce6..f362db49 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e7_2146.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e7_2146.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e7_3191_e7_2146(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e8_2830.lus b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e8_2830.lus
index 030326ed..55e1528a 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e8_2830.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_1b_e7_3191_e8_2830.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_1b_e7_3191_e8_2830(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_2.lus b/lustrec_tests/lustre_files/FIREFLY_luke_2.lus
index 88b63edf..e2ec617a 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_2.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_2.lus
@@ -75,7 +75,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_2(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_2_e2_1375_e1_418.lus b/lustrec_tests/lustre_files/FIREFLY_luke_2_e2_1375_e1_418.lus
index 2404a90d..5ae220dc 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_2_e2_1375_e1_418.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_2_e2_1375_e1_418.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_2_e2_1375_e1_418(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_2_e7_1826_e8_126.lus b/lustrec_tests/lustre_files/FIREFLY_luke_2_e7_1826_e8_126.lus
index dc8327a4..ab5ab434 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_2_e7_1826_e8_126.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_2_e7_1826_e8_126.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_2_e7_1826_e8_126(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_3.lus b/lustrec_tests/lustre_files/FIREFLY_luke_3.lus
index 77c8079e..80dff9d8 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_3.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_3.lus
@@ -75,7 +75,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_3(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_3_e1_2217_e3_1200.lus b/lustrec_tests/lustre_files/FIREFLY_luke_3_e1_2217_e3_1200.lus
index aaa828ad..993f69c5 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_3_e1_2217_e3_1200.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_3_e1_2217_e3_1200.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_3_e1_2217_e3_1200(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_4.lus b/lustrec_tests/lustre_files/FIREFLY_luke_4.lus
index 7a0cc01f..51c1d424 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_4.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_4.lus
@@ -75,7 +75,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_4(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_4_e2_325.lus b/lustrec_tests/lustre_files/FIREFLY_luke_4_e2_325.lus
index 63fe63ef..01c5a2d4 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_4_e2_325.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_4_e2_325.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_4_e2_325(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_5.lus b/lustrec_tests/lustre_files/FIREFLY_luke_5.lus
index 99b8641b..aefbf53f 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_5.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_5.lus
@@ -79,7 +79,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_5(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns(OK:bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt.lus
index 147cdda7..f07239c7 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt.lus
@@ -79,7 +79,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913.lus
index ec0b0442..8010153d 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e1_913(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e1_1993.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e1_1993.lus
index 45bc85f3..ea5562ba 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e1_1993.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e1_1993.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e1_913_e1_1993(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e2_3353.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e2_3353.lus
index f5aa1a15..81b69e72 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e2_3353.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e2_3353.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e1_913_e2_3353(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e3_2128.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e3_2128.lus
index f8215d1e..1f7df95f 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e3_2128.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e3_2128.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e1_913_e3_2128(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e7_1403.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e7_1403.lus
index d0be7799..5700b02b 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e7_1403.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e1_913_e7_1403.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e1_913_e7_1403(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460.lus
index c59f797f..bb9f98d5 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e2_3460(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e1_1455.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e1_1455.lus
index 5fb7577c..a08b5e3d 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e1_1455.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e1_1455.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e2_3460_e1_1455(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e2_2670.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e2_2670.lus
index cd933f5a..32a83a88 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e2_2670.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e2_2670.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e2_3460_e2_2670(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e3_1333.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e3_1333.lus
index 032918dd..c8633499 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e3_1333.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e3_1333.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e2_3460_e3_1333(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e7_471.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e7_471.lus
index 3eeff60f..fa092be7 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e7_471.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e2_3460_e7_471.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e2_3460_e7_471(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e3_1549.lus b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e3_1549.lus
index 01c84319..21eb3b85 100644
--- a/lustrec_tests/lustre_files/FIREFLY_luke_rt_e3_1549.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_luke_rt_e3_1549.lus
@@ -62,7 +62,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_luke_rt_e3_1549(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_rt.lus b/lustrec_tests/lustre_files/FIREFLY_rt.lus
index a9a959f3..31f9beb3 100644
--- a/lustrec_tests/lustre_files/FIREFLY_rt.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_rt.lus
@@ -72,7 +72,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_rt(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_rt_e3_1770_e2_637.lus b/lustrec_tests/lustre_files/FIREFLY_rt_e3_1770_e2_637.lus
index 5cce144c..d390e967 100644
--- a/lustrec_tests/lustre_files/FIREFLY_rt_e3_1770_e2_637.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_rt_e3_1770_e2_637.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_rt_e3_1770_e2_637(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_u1.lus b/lustrec_tests/lustre_files/FIREFLY_u1.lus
index 63c44843..2f785c8e 100644
--- a/lustrec_tests/lustre_files/FIREFLY_u1.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_u1.lus
@@ -72,7 +72,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_u1(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_u1_e2_3403_e2_957.lus b/lustrec_tests/lustre_files/FIREFLY_u1_e2_3403_e2_957.lus
index 02420d7d..5a4482c2 100644
--- a/lustrec_tests/lustre_files/FIREFLY_u1_e2_3403_e2_957.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_u1_e2_3403_e2_957.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_u1_e2_3403_e2_957(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/FIREFLY_u1_e7_3318.lus b/lustrec_tests/lustre_files/FIREFLY_u1_e7_3318.lus
index 82612cd3..5afea15d 100644
--- a/lustrec_tests/lustre_files/FIREFLY_u1_e7_3318.lus
+++ b/lustrec_tests/lustre_files/FIREFLY_u1_e7_3318.lus
@@ -59,7 +59,7 @@ let
 	if(e8) then if(garde8) then pre shared + pre exclusive + 1 else pre shared else
 	pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
+node FIREFLY_u1_e7_3318(e1, e2, e3, e4, e5, e6, e7, e8 : bool; i_invalid : int) 
 	returns( OK : bool );
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/Gas.lus b/lustrec_tests/lustre_files/Gas.lus
index 522f0b89..4c391e08 100644
--- a/lustrec_tests/lustre_files/Gas.lus
+++ b/lustrec_tests/lustre_files/Gas.lus
@@ -34,7 +34,7 @@ tel
 -- P is a an input used to define the start of an observation
 
 -- Not provable?
-node top (leak,P1:bool) returns (OK : bool);
+node Gas (leak,P1:bool) returns (OK : bool);
 --@ contract guarantee OK;
    var env : bool;
 let
diff --git a/lustrec_tests/lustre_files/ILLINOIS_1.lus b/lustrec_tests/lustre_files/ILLINOIS_1.lus
index fccf963a..4376790d 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_1.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_1.lus
@@ -71,7 +71,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_1(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2.lus b/lustrec_tests/lustre_files/ILLINOIS_2.lus
index 40ecc2da..deffdc71 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2.lus
@@ -71,7 +71,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2_e1_834.lus b/lustrec_tests/lustre_files/ILLINOIS_2_e1_834.lus
index 50c08ae0..6bd524ee 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2_e1_834.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2_e1_834.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2_e1_834(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e1_1895.lus b/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e1_1895.lus
index 54b7f372..158d2754 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e1_1895.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e1_1895.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2_e1_834_e1_1895(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e2_3395.lus b/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e2_3395.lus
index 09e5a4cd..8cab15bc 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e2_3395.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e2_3395.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2_e1_834_e2_3395(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e3_2931.lus b/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e3_2931.lus
index 5fae6649..e8293b92 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e3_2931.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e3_2931.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2_e1_834_e3_2931(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e7_3738.lus b/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e7_3738.lus
index 5b641d9d..1a2e930c 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e7_3738.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2_e1_834_e7_3738.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2_e1_834_e7_3738(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e1_3182.lus b/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e1_3182.lus
index bb940dcf..96299a39 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e1_3182.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e1_3182.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2_e2_2367_e1_3182(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e2_1561.lus b/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e2_1561.lus
index cefc3d8f..091cefa3 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e2_1561.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e2_1561.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2_e2_2367_e2_1561(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e3_1601.lus b/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e3_1601.lus
index 398d0faf..4d3febcb 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e3_1601.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e3_1601.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2_e2_2367_e3_1601(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e7_2728.lus b/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e7_2728.lus
index a166117f..fb488d55 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e7_2728.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2_e2_2367_e7_2728.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2_e2_2367_e7_2728(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_2_e2_876.lus b/lustrec_tests/lustre_files/ILLINOIS_2_e2_876.lus
index eaac09c2..e0563374 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_2_e2_876.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_2_e2_876.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_2_e2_876(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_3.lus b/lustrec_tests/lustre_files/ILLINOIS_3.lus
index e689df9e..65e4b226 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_3.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_3.lus
@@ -79,7 +79,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_3(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581.lus b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581.lus
index 8cd86da6..39dde297 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581.lus
@@ -66,7 +66,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_3_e3_2581(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e1_1130.lus b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e1_1130.lus
index 9ab0ee15..bc728dac 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e1_1130.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e1_1130.lus
@@ -66,7 +66,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_3_e3_2581_e1_1130(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e2_2545.lus b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e2_2545.lus
index ec77b1e6..7d381a60 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e2_2545.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e2_2545.lus
@@ -66,7 +66,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_3_e3_2581_e2_2545(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e3_979.lus b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e3_979.lus
index 3add6ed3..a22c0c09 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e3_979.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e3_979.lus
@@ -66,7 +66,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_3_e3_2581_e3_979(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e4_958.lus b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e4_958.lus
index d3946e5f..baf707cf 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e4_958.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e4_958.lus
@@ -66,7 +66,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_3_e3_2581_e4_958(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e5_4006.lus b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e5_4006.lus
index 1ccd7fc3..5e8378d3 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e5_4006.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e5_4006.lus
@@ -66,7 +66,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_3_e3_2581_e5_4006(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e7_3447.lus b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e7_3447.lus
index 6e7e09c4..d623b8e5 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e7_3447.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_3_e3_2581_e7_3447.lus
@@ -66,7 +66,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_3_e3_2581_e7_3447(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_4.lus b/lustrec_tests/lustre_files/ILLINOIS_4.lus
index 31ccc974..ef6ca0ab 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_4.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_4.lus
@@ -72,7 +72,7 @@ let
 tel
 
 -- Not provable in luke-bitvec
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_4(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_4_e7_2651_e7_2847.lus b/lustrec_tests/lustre_files/ILLINOIS_4_e7_2651_e7_2847.lus
index 75e680d0..65567c2d 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_4_e7_2651_e7_2847.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_4_e7_2651_e7_2847.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_4_e7_2651_e7_2847(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_5.lus b/lustrec_tests/lustre_files/ILLINOIS_5.lus
index d82d5ed8..6e351ec9 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_5.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_5.lus
@@ -71,7 +71,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_5(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_5_e7_692_e7_2865.lus b/lustrec_tests/lustre_files/ILLINOIS_5_e7_692_e7_2865.lus
index 5d8e805c..6603693a 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_5_e7_692_e7_2865.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_5_e7_692_e7_2865.lus
@@ -62,7 +62,7 @@ let
    if(e8) then if(g8) then pre shared-1 else pre shared else 
    pre shared;
 tel
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_5_e7_692_e7_2865(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_a1.lus b/lustrec_tests/lustre_files/ILLINOIS_a1.lus
index 0a90b314..a74a8b66 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_a1.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_a1.lus
@@ -72,7 +72,7 @@ let
 tel
 
 -- NOTE: Not provable!
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_a1(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_all.lus b/lustrec_tests/lustre_files/ILLINOIS_all.lus
index c2a893b1..42a279b5 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_all.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_all.lus
@@ -79,7 +79,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_all(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK by 2-induction;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/ILLINOIS_r4a.lus b/lustrec_tests/lustre_files/ILLINOIS_r4a.lus
index 372868c7..319723dd 100644
--- a/lustrec_tests/lustre_files/ILLINOIS_r4a.lus
+++ b/lustrec_tests/lustre_files/ILLINOIS_r4a.lus
@@ -72,7 +72,7 @@ let
 tel
 
 -- NOTE: Not provable!
-node top(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
+node ILLINOIS_r4a(e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool; init_invalid : int)
 returns( OK : bool);
 --@ contract guarantee OK;
     var invalid, dirty, exclusive, shared : int;
diff --git a/lustrec_tests/lustre_files/MESI_1.lus b/lustrec_tests/lustre_files/MESI_1.lus
index cc85a37a..d6f80370 100644
--- a/lustrec_tests/lustre_files/MESI_1.lus
+++ b/lustrec_tests/lustre_files/MESI_1.lus
@@ -54,7 +54,7 @@ let
 
 tel
 
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_1( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_1_e2_162_e7_1545.lus b/lustrec_tests/lustre_files/MESI_1_e2_162_e7_1545.lus
index 2e773476..fe35daeb 100644
--- a/lustrec_tests/lustre_files/MESI_1_e2_162_e7_1545.lus
+++ b/lustrec_tests/lustre_files/MESI_1_e2_162_e7_1545.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_1_e2_162_e7_1545( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_2.lus b/lustrec_tests/lustre_files/MESI_2.lus
index bfb903a8..37b59b82 100644
--- a/lustrec_tests/lustre_files/MESI_2.lus
+++ b/lustrec_tests/lustre_files/MESI_2.lus
@@ -54,7 +54,7 @@ let
 
 tel
 
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_2( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3.lus b/lustrec_tests/lustre_files/MESI_3.lus
index f6405f41..a5278184 100644
--- a/lustrec_tests/lustre_files/MESI_3.lus
+++ b/lustrec_tests/lustre_files/MESI_3.lus
@@ -60,7 +60,7 @@ let
 tel
 
 -- Only provable in nbac
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e1_2517_e8_2163.lus b/lustrec_tests/lustre_files/MESI_3_e1_2517_e8_2163.lus
index 43df9739..cb77835d 100644
--- a/lustrec_tests/lustre_files/MESI_3_e1_2517_e8_2163.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e1_2517_e8_2163.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e1_2517_e8_2163( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e2_819.lus b/lustrec_tests/lustre_files/MESI_3_e2_819.lus
index d2532609..bf3aaa85 100644
--- a/lustrec_tests/lustre_files/MESI_3_e2_819.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e2_819.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e2_819( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e2_819_e1_1145.lus b/lustrec_tests/lustre_files/MESI_3_e2_819_e1_1145.lus
index 95852e6c..5e2a9864 100644
--- a/lustrec_tests/lustre_files/MESI_3_e2_819_e1_1145.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e2_819_e1_1145.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e2_819_e1_1145( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e2_819_e2_562.lus b/lustrec_tests/lustre_files/MESI_3_e2_819_e2_562.lus
index da4b5ecf..0895deed 100644
--- a/lustrec_tests/lustre_files/MESI_3_e2_819_e2_562.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e2_819_e2_562.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e2_819_e2_562( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e2_819_e3_2698.lus b/lustrec_tests/lustre_files/MESI_3_e2_819_e3_2698.lus
index b44a17b2..0057a351 100644
--- a/lustrec_tests/lustre_files/MESI_3_e2_819_e3_2698.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e2_819_e3_2698.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e2_819_e3_2698( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e2_819_e4_1595.lus b/lustrec_tests/lustre_files/MESI_3_e2_819_e4_1595.lus
index f767daa6..90c1b6a9 100644
--- a/lustrec_tests/lustre_files/MESI_3_e2_819_e4_1595.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e2_819_e4_1595.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e2_819_e4_1595( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e2_819_e5_2554.lus b/lustrec_tests/lustre_files/MESI_3_e2_819_e5_2554.lus
index f8ca416c..fd867b3b 100644
--- a/lustrec_tests/lustre_files/MESI_3_e2_819_e5_2554.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e2_819_e5_2554.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e2_819_e5_2554( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e2_819_e6_1459.lus b/lustrec_tests/lustre_files/MESI_3_e2_819_e6_1459.lus
index 678f84c0..fe5316f8 100644
--- a/lustrec_tests/lustre_files/MESI_3_e2_819_e6_1459.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e2_819_e6_1459.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e2_819_e6_1459( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e2_819_e7_1665.lus b/lustrec_tests/lustre_files/MESI_3_e2_819_e7_1665.lus
index 57de5da3..946a0de2 100644
--- a/lustrec_tests/lustre_files/MESI_3_e2_819_e7_1665.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e2_819_e7_1665.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e2_819_e7_1665( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e2_819_e8_1896.lus b/lustrec_tests/lustre_files/MESI_3_e2_819_e8_1896.lus
index 61f297df..b5f01551 100644
--- a/lustrec_tests/lustre_files/MESI_3_e2_819_e8_1896.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e2_819_e8_1896.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e2_819_e8_1896( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_3_e3_2669.lus b/lustrec_tests/lustre_files/MESI_3_e3_2669.lus
index 618413d2..57f083d0 100644
--- a/lustrec_tests/lustre_files/MESI_3_e3_2669.lus
+++ b/lustrec_tests/lustre_files/MESI_3_e3_2669.lus
@@ -49,7 +49,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_3_e3_2669( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_4.lus b/lustrec_tests/lustre_files/MESI_4.lus
index 80bf9ea5..2cfeb7f9 100644
--- a/lustrec_tests/lustre_files/MESI_4.lus
+++ b/lustrec_tests/lustre_files/MESI_4.lus
@@ -54,7 +54,7 @@ let
 
 tel
 
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_4( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_4_e7_1140_e7_433.lus b/lustrec_tests/lustre_files/MESI_4_e7_1140_e7_433.lus
index 57e57c3c..7da625a3 100644
--- a/lustrec_tests/lustre_files/MESI_4_e7_1140_e7_433.lus
+++ b/lustrec_tests/lustre_files/MESI_4_e7_1140_e7_433.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_4_e7_1140_e7_433( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_all.lus b/lustrec_tests/lustre_files/MESI_all.lus
index 0c2561cd..010e4bfa 100644
--- a/lustrec_tests/lustre_files/MESI_all.lus
+++ b/lustrec_tests/lustre_files/MESI_all.lus
@@ -54,7 +54,7 @@ let
 
 tel
 
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool )
+node MESI_all( etat_me1, etat_me2, etat_me3, etat_me4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
diff --git a/lustrec_tests/lustre_files/MESI_all_e4_1147_e7_497.lus b/lustrec_tests/lustre_files/MESI_all_e4_1147_e7_497.lus
index 2c8c5dab..8a71d63f 100644
--- a/lustrec_tests/lustre_files/MESI_all_e4_1147_e7_497.lus
+++ b/lustrec_tests/lustre_files/MESI_all_e4_1147_e7_497.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool )
+node MESI_all_e4_1147_e7_497( etat_me1, etat_me2, etat_me3, etat_me4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
diff --git a/lustrec_tests/lustre_files/MESI_i1.lus b/lustrec_tests/lustre_files/MESI_i1.lus
index 92320b48..ea23892a 100644
--- a/lustrec_tests/lustre_files/MESI_i1.lus
+++ b/lustrec_tests/lustre_files/MESI_i1.lus
@@ -54,7 +54,7 @@ let
 
 tel
 
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e2_1758_e8_12.lus b/lustrec_tests/lustre_files/MESI_i1_e2_1758_e8_12.lus
index af73e309..dc2cfc55 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e2_1758_e8_12.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e2_1758_e8_12.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e2_1758_e8_12( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e2_2656.lus b/lustrec_tests/lustre_files/MESI_i1_e2_2656.lus
index baa6da75..bb3fb3d4 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e2_2656.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e2_2656.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e2_2656( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e3_2145.lus b/lustrec_tests/lustre_files/MESI_i1_e3_2145.lus
index 81f5b1fd..217f7f74 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e3_2145.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e3_2145.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e3_2145( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e1_2667.lus b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e1_2667.lus
index f2dd3b29..e2f5fdbe 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e1_2667.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e1_2667.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e3_2145_e1_2667( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e2_2228.lus b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e2_2228.lus
index 53ea579d..b9f052a1 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e2_2228.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e2_2228.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e3_2145_e2_2228( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e3_977.lus b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e3_977.lus
index e8268f47..7e6cb1f3 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e3_977.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e3_977.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e3_2145_e3_977( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e4_1717.lus b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e4_1717.lus
index 7021f9e7..12d9983b 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e4_1717.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e4_1717.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e3_2145_e4_1717( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e5_2391.lus b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e5_2391.lus
index 8ed154a8..d3f65c9b 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e5_2391.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e5_2391.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e3_2145_e5_2391( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e7_1847.lus b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e7_1847.lus
index d458abc2..ee753437 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e7_1847.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e7_1847.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e3_2145_e7_1847( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e8_2325.lus b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e8_2325.lus
index f2880c87..4354c450 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e3_2145_e8_2325.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e3_2145_e8_2325.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e3_2145_e8_2325( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e4_1986.lus b/lustrec_tests/lustre_files/MESI_i1_e4_1986.lus
index 4b12e7aa..21d050da 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e4_1986.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e4_1986.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e4_1986( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i1_e4_1986_e1_1519.lus b/lustrec_tests/lustre_files/MESI_i1_e4_1986_e1_1519.lus
index e7995554..e2dc084f 100644
--- a/lustrec_tests/lustre_files/MESI_i1_e4_1986_e1_1519.lus
+++ b/lustrec_tests/lustre_files/MESI_i1_e4_1986_e1_1519.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i1_e4_1986_e1_1519( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i2.lus b/lustrec_tests/lustre_files/MESI_i2.lus
index 9a8cfe5f..ed796dd1 100644
--- a/lustrec_tests/lustre_files/MESI_i2.lus
+++ b/lustrec_tests/lustre_files/MESI_i2.lus
@@ -54,7 +54,7 @@ let
 
 tel
 
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i2( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i3.lus b/lustrec_tests/lustre_files/MESI_i3.lus
index 3a91dd00..140d68d3 100644
--- a/lustrec_tests/lustre_files/MESI_i3.lus
+++ b/lustrec_tests/lustre_files/MESI_i3.lus
@@ -54,7 +54,7 @@ let
 
 tel
 
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i3( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i3_e1_447.lus b/lustrec_tests/lustre_files/MESI_i3_e1_447.lus
index 28cc7e4b..a363d53f 100644
--- a/lustrec_tests/lustre_files/MESI_i3_e1_447.lus
+++ b/lustrec_tests/lustre_files/MESI_i3_e1_447.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i3_e1_447( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i3_e1_447_e1_1292.lus b/lustrec_tests/lustre_files/MESI_i3_e1_447_e1_1292.lus
index 9ca4f20b..24dd91ee 100644
--- a/lustrec_tests/lustre_files/MESI_i3_e1_447_e1_1292.lus
+++ b/lustrec_tests/lustre_files/MESI_i3_e1_447_e1_1292.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i3_e1_447_e1_1292( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i3_e1_447_e2_1098.lus b/lustrec_tests/lustre_files/MESI_i3_e1_447_e2_1098.lus
index 4233d840..36e64987 100644
--- a/lustrec_tests/lustre_files/MESI_i3_e1_447_e2_1098.lus
+++ b/lustrec_tests/lustre_files/MESI_i3_e1_447_e2_1098.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i3_e1_447_e2_1098( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i3_e1_447_e3_1180.lus b/lustrec_tests/lustre_files/MESI_i3_e1_447_e3_1180.lus
index ecb2abb7..6b08e083 100644
--- a/lustrec_tests/lustre_files/MESI_i3_e1_447_e3_1180.lus
+++ b/lustrec_tests/lustre_files/MESI_i3_e1_447_e3_1180.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i3_e1_447_e3_1180( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i3_e1_447_e5_2444.lus b/lustrec_tests/lustre_files/MESI_i3_e1_447_e5_2444.lus
index e6ad7814..903c62dc 100644
--- a/lustrec_tests/lustre_files/MESI_i3_e1_447_e5_2444.lus
+++ b/lustrec_tests/lustre_files/MESI_i3_e1_447_e5_2444.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i3_e1_447_e5_2444( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i3_e1_447_e6_2281.lus b/lustrec_tests/lustre_files/MESI_i3_e1_447_e6_2281.lus
index f1f37ee7..cfab6e0a 100644
--- a/lustrec_tests/lustre_files/MESI_i3_e1_447_e6_2281.lus
+++ b/lustrec_tests/lustre_files/MESI_i3_e1_447_e6_2281.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i3_e1_447_e6_2281( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i3_e1_447_e7_2194.lus b/lustrec_tests/lustre_files/MESI_i3_e1_447_e7_2194.lus
index bf3f99c5..2d055308 100644
--- a/lustrec_tests/lustre_files/MESI_i3_e1_447_e7_2194.lus
+++ b/lustrec_tests/lustre_files/MESI_i3_e1_447_e7_2194.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i3_e1_447_e7_2194( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i4.lus b/lustrec_tests/lustre_files/MESI_i4.lus
index efe5f667..6e82c36f 100644
--- a/lustrec_tests/lustre_files/MESI_i4.lus
+++ b/lustrec_tests/lustre_files/MESI_i4.lus
@@ -54,7 +54,7 @@ let
 
 tel
 
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i4( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i4_e4_1689.lus b/lustrec_tests/lustre_files/MESI_i4_e4_1689.lus
index 2675d81c..083cace6 100644
--- a/lustrec_tests/lustre_files/MESI_i4_e4_1689.lus
+++ b/lustrec_tests/lustre_files/MESI_i4_e4_1689.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i4_e4_1689( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i4_e6_2175.lus b/lustrec_tests/lustre_files/MESI_i4_e6_2175.lus
index fdddb111..5aaa14be 100644
--- a/lustrec_tests/lustre_files/MESI_i4_e6_2175.lus
+++ b/lustrec_tests/lustre_files/MESI_i4_e6_2175.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i4_e6_2175( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i4_e7_1017_e6_1132.lus b/lustrec_tests/lustre_files/MESI_i4_e7_1017_e6_1132.lus
index 4e8379e8..c5ed9bd8 100644
--- a/lustrec_tests/lustre_files/MESI_i4_e7_1017_e6_1132.lus
+++ b/lustrec_tests/lustre_files/MESI_i4_e7_1017_e6_1132.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i4_e7_1017_e6_1132( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i4_e8_1381_e1_1837.lus b/lustrec_tests/lustre_files/MESI_i4_e8_1381_e1_1837.lus
index 826b367f..51b4f5c7 100644
--- a/lustrec_tests/lustre_files/MESI_i4_e8_1381_e1_1837.lus
+++ b/lustrec_tests/lustre_files/MESI_i4_e8_1381_e1_1837.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i4_e8_1381_e1_1837( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MESI_i4_e8_1381_e4_313.lus b/lustrec_tests/lustre_files/MESI_i4_e8_1381_e4_313.lus
index e24be869..6df3ec59 100644
--- a/lustrec_tests/lustre_files/MESI_i4_e8_1381_e4_313.lus
+++ b/lustrec_tests/lustre_files/MESI_i4_e8_1381_e4_313.lus
@@ -45,7 +45,7 @@ let
    if(etat_me4) then if(garde_me4) then pre invalid_me + pre modified_me + pre exclusive_me + pre shared_me -1 else pre invalid_me else 
    pre invalid_me;
 tel
-node top( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
+node MESI_i4_e8_1381_e4_313( etat_me1, etat_me2, etat_me3, etat_me4 : bool ) returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_me, exclusive_me, shared_me, invalid_me : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/MOESI_1.lus b/lustrec_tests/lustre_files/MOESI_1.lus
index 7e5da704..439a0ac5 100644
--- a/lustrec_tests/lustre_files/MOESI_1.lus
+++ b/lustrec_tests/lustre_files/MOESI_1.lus
@@ -59,7 +59,7 @@ let
 
 tel
 
-node top( init_invalid_mo : int;
+node MOESI_1( init_invalid_mo : int;
              etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/MOESI_1_e2_982_e7_492.lus b/lustrec_tests/lustre_files/MOESI_1_e2_982_e7_492.lus
index 802f63f6..6dd411d8 100644
--- a/lustrec_tests/lustre_files/MOESI_1_e2_982_e7_492.lus
+++ b/lustrec_tests/lustre_files/MOESI_1_e2_982_e7_492.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int;
+node MOESI_1_e2_982_e7_492( init_invalid_mo : int;
              etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/MOESI_1_e3_1884_e7_1875.lus b/lustrec_tests/lustre_files/MOESI_1_e3_1884_e7_1875.lus
index 9e000760..d940c039 100644
--- a/lustrec_tests/lustre_files/MOESI_1_e3_1884_e7_1875.lus
+++ b/lustrec_tests/lustre_files/MOESI_1_e3_1884_e7_1875.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int;
+node MOESI_1_e3_1884_e7_1875( init_invalid_mo : int;
              etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/MOESI_2.lus b/lustrec_tests/lustre_files/MOESI_2.lus
index 614fb526..0a7166d2 100644
--- a/lustrec_tests/lustre_files/MOESI_2.lus
+++ b/lustrec_tests/lustre_files/MOESI_2.lus
@@ -59,7 +59,7 @@ let
 
 tel
 
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e1_1753.lus b/lustrec_tests/lustre_files/MOESI_2_e1_1753.lus
index b2490695..c55a33c5 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e1_1753.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e1_1753.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e1_1753( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e1_1753_e1_1510.lus b/lustrec_tests/lustre_files/MOESI_2_e1_1753_e1_1510.lus
index adfc794d..92eb48dc 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e1_1753_e1_1510.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e1_1753_e1_1510.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e1_1753_e1_1510( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e1_1753_e2_615.lus b/lustrec_tests/lustre_files/MOESI_2_e1_1753_e2_615.lus
index b486299d..6a33d5c7 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e1_1753_e2_615.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e1_1753_e2_615.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e1_1753_e2_615( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e1_1753_e3_2021.lus b/lustrec_tests/lustre_files/MOESI_2_e1_1753_e3_2021.lus
index e389cf7b..907791bd 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e1_1753_e3_2021.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e1_1753_e3_2021.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e1_1753_e3_2021( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e2_155.lus b/lustrec_tests/lustre_files/MOESI_2_e2_155.lus
index c1ab3d7f..0aa949f5 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e2_155.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e2_155.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e2_155( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e2_1599.lus b/lustrec_tests/lustre_files/MOESI_2_e2_1599.lus
index c1ab3d7f..a91f9e39 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e2_1599.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e2_1599.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e2_1599( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e2_1599_e1_2383.lus b/lustrec_tests/lustre_files/MOESI_2_e2_1599_e1_2383.lus
index 6ea08db4..802686b3 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e2_1599_e1_2383.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e2_1599_e1_2383.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e2_1599_e1_2383( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e2_1599_e2_1815.lus b/lustrec_tests/lustre_files/MOESI_2_e2_1599_e2_1815.lus
index 36a11603..2e117107 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e2_1599_e2_1815.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e2_1599_e2_1815.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e2_1599_e2_1815( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e2_1599_e3_1658.lus b/lustrec_tests/lustre_files/MOESI_2_e2_1599_e3_1658.lus
index 9c2a2616..5bb59ddc 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e2_1599_e3_1658.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e2_1599_e3_1658.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e2_1599_e3_1658( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e2_1599_e8_1334.lus b/lustrec_tests/lustre_files/MOESI_2_e2_1599_e8_1334.lus
index da8237d6..e107fdeb 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e2_1599_e8_1334.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e2_1599_e8_1334.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e2_1599_e8_1334( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e3_1523.lus b/lustrec_tests/lustre_files/MOESI_2_e3_1523.lus
index 3d89e013..43138c83 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e3_1523.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e3_1523.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e3_1523( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e3_929.lus b/lustrec_tests/lustre_files/MOESI_2_e3_929.lus
index 3d89e013..ea48ba33 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e3_929.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e3_929.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e3_929( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e3_929_e1_2319.lus b/lustrec_tests/lustre_files/MOESI_2_e3_929_e1_2319.lus
index 311d94a9..c98d5798 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e3_929_e1_2319.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e3_929_e1_2319.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e3_929_e1_2319( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e3_929_e2_2421.lus b/lustrec_tests/lustre_files/MOESI_2_e3_929_e2_2421.lus
index 963accfa..c30897b4 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e3_929_e2_2421.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e3_929_e2_2421.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e3_929_e2_2421( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e3_929_e3_2294.lus b/lustrec_tests/lustre_files/MOESI_2_e3_929_e3_2294.lus
index b09b2d74..4b4f6c30 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e3_929_e3_2294.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e3_929_e3_2294.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e3_929_e3_2294( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e3_929_e4_578.lus b/lustrec_tests/lustre_files/MOESI_2_e3_929_e4_578.lus
index 5dd3f792..82b7c0c9 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e3_929_e4_578.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e3_929_e4_578.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e3_929_e4_578( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e3_929_e5_1826.lus b/lustrec_tests/lustre_files/MOESI_2_e3_929_e5_1826.lus
index ede5e0f4..546a2614 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e3_929_e5_1826.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e3_929_e5_1826.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e3_929_e5_1826( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e3_929_e6_2707.lus b/lustrec_tests/lustre_files/MOESI_2_e3_929_e6_2707.lus
index c596df46..bbfefb24 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e3_929_e6_2707.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e3_929_e6_2707.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e3_929_e6_2707( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e3_929_e7_619.lus b/lustrec_tests/lustre_files/MOESI_2_e3_929_e7_619.lus
index e2d25586..d70348a3 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e3_929_e7_619.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e3_929_e7_619.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e3_929_e7_619( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e3_929_e8_1167.lus b/lustrec_tests/lustre_files/MOESI_2_e3_929_e8_1167.lus
index 5c4635ff..51a2ba9a 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e3_929_e8_1167.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e3_929_e8_1167.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e3_929_e8_1167( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e7_2607.lus b/lustrec_tests/lustre_files/MOESI_2_e7_2607.lus
index 8086354b..5bee44d4 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e7_2607.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e7_2607.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e7_2607( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e7_2910.lus b/lustrec_tests/lustre_files/MOESI_2_e7_2910.lus
index 8086354b..cf76e804 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e7_2910.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e7_2910.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e7_2910( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e7_2910_e1_1021.lus b/lustrec_tests/lustre_files/MOESI_2_e7_2910_e1_1021.lus
index bc22fb5e..e5a3e556 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e7_2910_e1_1021.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e7_2910_e1_1021.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e7_2910_e1_1021( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e7_2910_e2_611.lus b/lustrec_tests/lustre_files/MOESI_2_e7_2910_e2_611.lus
index 9634007e..bd6eb253 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e7_2910_e2_611.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e7_2910_e2_611.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e7_2910_e2_611( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e7_2910_e3_2002.lus b/lustrec_tests/lustre_files/MOESI_2_e7_2910_e3_2002.lus
index e2d25586..29692aa7 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e7_2910_e3_2002.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e7_2910_e3_2002.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e7_2910_e3_2002( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e7_2910_e7_1804.lus b/lustrec_tests/lustre_files/MOESI_2_e7_2910_e7_1804.lus
index d458dab6..20aed278 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e7_2910_e7_1804.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e7_2910_e7_1804.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e7_2910_e7_1804( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e7_2910_e8_2590.lus b/lustrec_tests/lustre_files/MOESI_2_e7_2910_e8_2590.lus
index c596df46..e504eb4c 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e7_2910_e8_2590.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e7_2910_e8_2590.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e7_2910_e8_2590( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e8_101.lus b/lustrec_tests/lustre_files/MOESI_2_e8_101.lus
index f6895a96..a870feae 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e8_101.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e8_101.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e8_101( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e8_926.lus b/lustrec_tests/lustre_files/MOESI_2_e8_926.lus
index f6895a96..96f245a5 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e8_926.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e8_926.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e8_926( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e8_926_e1_1065.lus b/lustrec_tests/lustre_files/MOESI_2_e8_926_e1_1065.lus
index e156c050..32ffeb99 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e8_926_e1_1065.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e8_926_e1_1065.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e8_926_e1_1065( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e8_926_e2_349.lus b/lustrec_tests/lustre_files/MOESI_2_e8_926_e2_349.lus
index da8237d6..de4e482d 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e8_926_e2_349.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e8_926_e2_349.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e8_926_e2_349( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e8_926_e3_1758.lus b/lustrec_tests/lustre_files/MOESI_2_e8_926_e3_1758.lus
index 5c4635ff..7c353699 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e8_926_e3_1758.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e8_926_e3_1758.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e8_926_e3_1758( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e8_926_e7_961.lus b/lustrec_tests/lustre_files/MOESI_2_e8_926_e7_961.lus
index 80b0e914..0b8960be 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e8_926_e7_961.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e8_926_e7_961.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e8_926_e7_961( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_2_e8_926_e8_2138.lus b/lustrec_tests/lustre_files/MOESI_2_e8_926_e8_2138.lus
index 8a7df27c..2cee426d 100644
--- a/lustrec_tests/lustre_files/MOESI_2_e8_926_e8_2138.lus
+++ b/lustrec_tests/lustre_files/MOESI_2_e8_926_e8_2138.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
+node MOESI_2_e8_926_e8_2138( init_invalid_mo : int; etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var modified_mo, exclusive_mo, shared_mo, invalid_mo, owned_mo: int;
diff --git a/lustrec_tests/lustre_files/MOESI_all.lus b/lustrec_tests/lustre_files/MOESI_all.lus
index ae1abaaf..43314f28 100644
--- a/lustrec_tests/lustre_files/MOESI_all.lus
+++ b/lustrec_tests/lustre_files/MOESI_all.lus
@@ -59,7 +59,7 @@ let
 
 tel
 
-node top( init_invalid_mo : int;
+node MOESI_all( init_invalid_mo : int;
            etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/MOESI_all_e3_2032_e3_2788.lus b/lustrec_tests/lustre_files/MOESI_all_e3_2032_e3_2788.lus
index 99902a31..8ff91f41 100644
--- a/lustrec_tests/lustre_files/MOESI_all_e3_2032_e3_2788.lus
+++ b/lustrec_tests/lustre_files/MOESI_all_e3_2032_e3_2788.lus
@@ -48,7 +48,7 @@ let
    if(etat_mo4) then if(garde_mo4) then 0 else pre owned_mo else 
    pre owned_mo;
 tel
-node top( init_invalid_mo : int;
+node MOESI_all_e3_2032_e3_2788( init_invalid_mo : int;
            etat_mo1, etat_mo2, etat_mo3, etat_mo4 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_1.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_1.lus
index a38ec0a3..be966a51 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_1.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_1.lus
@@ -39,7 +39,7 @@ let
 tel
 
 -- Not provable with luke-bitvec
-node top(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
+node PRODUCER_CONSUMER_1(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var i, b, a, o1, o2 : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_2.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_2.lus
index 1adf15aa..80562fc2 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_2.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_2.lus
@@ -38,7 +38,7 @@ let
 
 tel
 
-node top(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
+node PRODUCER_CONSUMER_2(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var i, b, a, o1, o2 : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_3.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_3.lus
index c619b794..ec1699b9 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_3.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_3.lus
@@ -48,7 +48,7 @@ let
 
 tel
 
-node top(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
+node PRODUCER_CONSUMER_3(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var i, b, a, o1, o2 : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_all.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_all.lus
index 27a901a5..1cc8873c 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_all.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_all.lus
@@ -48,7 +48,7 @@ let
 
 tel
 
-node top(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
+node PRODUCER_CONSUMER_all(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var i, b, a, o1, o2 : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt.lus
index 7310d626..65f95908 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt.lus
@@ -48,7 +48,7 @@ let
 
 tel
 
-node top(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
+node PRODUCER_CONSUMER_vt(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
 --@ contract guarantee OK;
     var i, b, a, o1, o2 : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e2_1352.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e2_1352.lus
index 5eb8bc2c..500f7e59 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e2_1352.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e2_1352.lus
@@ -37,7 +37,7 @@ let
 	if(etat3) then if(garde3) then pre o2+1 else pre o2 else
 	pre o2;
 tel
-node top(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
+node PRODUCER_CONSUMER_vt_e2_1352(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
 --@ contract guarantee OK;
     var i, b, a, o1, o2 : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e3_507.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e3_507.lus
index 3fbab4fa..c8848516 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e3_507.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e3_507.lus
@@ -37,7 +37,7 @@ let
 	if(etat3) then if(garde3) then pre o2+1 else pre o2 else
 	pre o2;
 tel
-node top(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
+node PRODUCER_CONSUMER_vt_e3_507(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
 --@ contract guarantee OK;
     var i, b, a, o1, o2 : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e7_1059_e8_1111.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e7_1059_e8_1111.lus
index 7d00b16f..5168f176 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e7_1059_e8_1111.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMER_vt_e7_1059_e8_1111.lus
@@ -37,7 +37,7 @@ let
 	if(etat3) then if(garde3) then pre o2+1 else pre o2 else
 	pre o2;
 tel
-node top(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
+node PRODUCER_CONSUMER_vt_e7_1059_e8_1111(etat1, etat2, etat3 : bool; a_init : int) returns ( OK : bool );
 --@ contract guarantee OK;
     var i, b, a, o1, o2 : int;
         env : bool;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_1.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_1.lus
index 12547bfe..542538ea 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_1.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_1.lus
@@ -48,7 +48,7 @@ let
 
 tel
 		
-node top( etat1, etat2, etat3 : bool; a_init : int )
+node PRODUCER_CONSUMMER_luke_1( etat1, etat2, etat3 : bool; a_init : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var i, b, a, o1, o2 : int;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_2.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_2.lus
index c0afd02a..26eda376 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_2.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_2.lus
@@ -48,7 +48,7 @@ let
 
 tel
 
-node top( etat1, etat2, etat3 : bool; a_init : int )
+node PRODUCER_CONSUMMER_luke_2( etat1, etat2, etat3 : bool; a_init : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var i, b, a, o1, o2 : int;
diff --git a/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_2_e7_1068_e8_1019.lus b/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_2_e7_1068_e8_1019.lus
index 6d8686da..3c85724f 100644
--- a/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_2_e7_1068_e8_1019.lus
+++ b/lustrec_tests/lustre_files/PRODUCER_CONSUMMER_luke_2_e7_1068_e8_1019.lus
@@ -33,7 +33,7 @@ let
 	if(etat3) then if(garde3) then pre o2+1 else pre o2 else
 	pre o2;
 tel
-node top( etat1, etat2, etat3 : bool; a_init : int )
+node PRODUCER_CONSUMMER_luke_2_e7_1068_e8_1019( etat1, etat2, etat3 : bool; a_init : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var i, b, a, o1, o2 : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123.lus b/lustrec_tests/lustre_files/SYNAPSE_123.lus
index 24357e42..a91d2f82 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123.lus
@@ -47,7 +47,7 @@ let
 tel
 
 
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e2_1653.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e2_1653.lus
index a5f4f197..e9f1822f 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e2_1653.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e2_1653.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e2_1653(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e3_302.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e3_302.lus
index a165468c..8a4d4906 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e3_302.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e3_302.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e3_302(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e3_302_e1_1141.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e3_302_e1_1141.lus
index 3c325957..8443969c 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e3_302_e1_1141.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e3_302_e1_1141.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e3_302_e1_1141(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e2_1394.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e2_1394.lus
index b4b4a78c..3769a8f8 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e2_1394.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e2_1394.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e7_837_e2_1394(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e3_135.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e3_135.lus
index ad59d3f4..2ce20c56 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e3_135.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e3_135.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e7_837_e3_135(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e7_1262.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e7_1262.lus
index e85c17ae..b16ca0b2 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e7_1262.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e7_837_e7_1262.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e7_837_e7_1262(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e7_856.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e7_856.lus
index 631ebb26..d1342e12 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e7_856.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e7_856.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e7_856(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953.lus
index e0b9084d..71010e74 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e8_953(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e1_1128.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e1_1128.lus
index deda789b..dcb5fc14 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e1_1128.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e1_1128.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e8_953_e1_1128(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e2_458.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e2_458.lus
index e85ae9bb..f236ed0b 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e2_458.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e2_458.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e8_953_e2_458(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e3_271.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e3_271.lus
index c419b7e2..1fc2c9c9 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e3_271.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e3_271.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e8_953_e3_271(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e7_1465.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e7_1465.lus
index 02284ba2..164c91dd 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e7_1465.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e7_1465.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e8_953_e7_1465(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e8_941.lus b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e8_941.lus
index 0db434db..4cfccfc7 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e8_941.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_123_e8_953_e8_941.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_123_e8_953_e8_941(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2.lus b/lustrec_tests/lustre_files/SYNAPSE_2.lus
index 21af8a45..3e822cc0 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2.lus
@@ -42,7 +42,7 @@ let
 
 tel
 
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239.lus b/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239.lus
index bc4d7d15..3f355b39 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2_e1_1239(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239_e1_1331.lus b/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239_e1_1331.lus
index 2c3c21c6..c2d196f1 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239_e1_1331.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239_e1_1331.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2_e1_1239_e1_1331(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239_e2_74.lus b/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239_e2_74.lus
index 9f99eeba..cdec9d92 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239_e2_74.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2_e1_1239_e2_74.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2_e1_1239_e2_74(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2_e3_216.lus b/lustrec_tests/lustre_files/SYNAPSE_2_e3_216.lus
index 64dd31e6..5e7c97d9 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2_e3_216.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2_e3_216.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2_e3_216(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e1_667.lus b/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e1_667.lus
index 0940c94b..13a8c49b 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e1_667.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e1_667.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2_e8_1118_e1_667(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e2_237.lus b/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e2_237.lus
index 66bc9889..4e6e8a89 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e2_237.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e2_237.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2_e8_1118_e2_237(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e3_1216.lus b/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e3_1216.lus
index 4641b7e9..f3874fd0 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e3_1216.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e3_1216.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2_e8_1118_e3_1216(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e7_1043.lus b/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e7_1043.lus
index c72d0d7a..814bb65c 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e7_1043.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e7_1043.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2_e8_1118_e7_1043(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e8_1177.lus b/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e8_1177.lus
index c1b97ec2..1ca7850c 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e8_1177.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2_e8_1118_e8_1177.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2_e8_1118_e8_1177(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_2_e8_656.lus b/lustrec_tests/lustre_files/SYNAPSE_2_e8_656.lus
index 2fc1a0f1..cd821798 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_2_e8_656.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_2_e8_656.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_2_e8_656(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3.lus b/lustrec_tests/lustre_files/SYNAPSE_3.lus
index 3300c2d3..e3da2581 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3.lus
@@ -46,7 +46,7 @@ let
 
 tel
 
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416.lus
index 12de14f7..eaf74aaa 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e1_1416(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e1_1675.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e1_1675.lus
index da288d74..bb72b1a6 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e1_1675.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e1_1675.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e1_1416_e1_1675(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e2_753.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e2_753.lus
index 6ab06b22..fce21e35 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e2_753.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e2_753.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e1_1416_e2_753(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e3_1191.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e3_1191.lus
index 49bc09b8..a003e173 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e3_1191.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e3_1191.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e1_1416_e3_1191(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e7_193.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e7_193.lus
index 836cea59..a82e9544 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e7_193.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e1_1416_e7_193.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e1_1416_e7_193(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e3_1041.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e3_1041.lus
index e8fef031..d86cecc6 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e3_1041.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e3_1041.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e3_1041(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e7_1444_e7_638.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e7_1444_e7_638.lus
index 119d57ec..cd6ec973 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e7_1444_e7_638.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e7_1444_e7_638.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e7_1444_e7_638(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e7_425.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e7_425.lus
index 89ab1069..e82ce449 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e7_425.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e7_425.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e7_425(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e1_1270.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e1_1270.lus
index 94a2696e..74a4be76 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e1_1270.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e1_1270.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e8_1329_e1_1270(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e2_236.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e2_236.lus
index 5c4bead0..d658a272 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e2_236.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e2_236.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e8_1329_e2_236(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e3_421.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e3_421.lus
index bf5f97a3..cd6e3612 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e3_421.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e3_421.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e8_1329_e3_421(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e7_1062.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e7_1062.lus
index ea4655b8..62eb6aea 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e7_1062.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e7_1062.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e8_1329_e7_1062(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e8_320.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e8_320.lus
index fb7b0a9e..83919aee 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e8_320.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1329_e8_320.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e8_1329_e8_320(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1708.lus b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1708.lus
index b717c8b4..0624e7a1 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_3_e8_1708.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_3_e8_1708.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_3_e8_1708(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_4.lus b/lustrec_tests/lustre_files/SYNAPSE_4.lus
index 26937607..bc434892 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_4.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_4.lus
@@ -42,7 +42,7 @@ let
 
 tel
 
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_4(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_4_e8_420_e7_572.lus b/lustrec_tests/lustre_files/SYNAPSE_4_e8_420_e7_572.lus
index 5bd99024..78f1052d 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_4_e8_420_e7_572.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_4_e8_420_e7_572.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_4_e8_420_e7_572(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 4-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_4_e8_420_e8_1525.lus b/lustrec_tests/lustre_files/SYNAPSE_4_e8_420_e8_1525.lus
index b77bed28..b4c6a453 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_4_e8_420_e8_1525.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_4_e8_420_e8_1525.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_4_e8_420_e8_1525(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_4_e8_974.lus b/lustrec_tests/lustre_files/SYNAPSE_4_e8_974.lus
index e589b510..3da107fc 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_4_e8_974.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_4_e8_974.lus
@@ -32,7 +32,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_4_e8_974(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_5.lus b/lustrec_tests/lustre_files/SYNAPSE_5.lus
index d3df7b5b..86c04894 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_5.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_5.lus
@@ -47,7 +47,7 @@ let
 tel
 
 -- Only provable in nbac
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_5(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_5_e1_811.lus b/lustrec_tests/lustre_files/SYNAPSE_5_e1_811.lus
index 8f6f476b..b3300558 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_5_e1_811.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_5_e1_811.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_5_e1_811(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_5_e1_811_e1_823.lus b/lustrec_tests/lustre_files/SYNAPSE_5_e1_811_e1_823.lus
index ec43fa19..414d5db6 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_5_e1_811_e1_823.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_5_e1_811_e1_823.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_5_e1_811_e1_823(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_5_e1_811_e2_1026.lus b/lustrec_tests/lustre_files/SYNAPSE_5_e1_811_e2_1026.lus
index 78ea9820..42a958e2 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_5_e1_811_e2_1026.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_5_e1_811_e2_1026.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_5_e1_811_e2_1026(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_5_e2_1525.lus b/lustrec_tests/lustre_files/SYNAPSE_5_e2_1525.lus
index 2687351a..75842187 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_5_e2_1525.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_5_e2_1525.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_5_e2_1525(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_6.lus b/lustrec_tests/lustre_files/SYNAPSE_6.lus
index 49ce7492..1c96111d 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_6.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_6.lus
@@ -47,7 +47,7 @@ let
 tel
 
 -- Only provable in nbac
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_6(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_6_e2_1439_e1_954.lus b/lustrec_tests/lustre_files/SYNAPSE_6_e2_1439_e1_954.lus
index e8510162..c1e0a79e 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_6_e2_1439_e1_954.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_6_e2_1439_e1_954.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_6_e2_1439_e1_954(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_6_e3_1666_e5_1558.lus b/lustrec_tests/lustre_files/SYNAPSE_6_e3_1666_e5_1558.lus
index aa8004c0..49cef886 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_6_e3_1666_e5_1558.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_6_e3_1666_e5_1558.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_6_e3_1666_e5_1558(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_6_e7_938_e2_1012.lus b/lustrec_tests/lustre_files/SYNAPSE_6_e7_938_e2_1012.lus
index 5a3f05ff..961894ba 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_6_e7_938_e2_1012.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_6_e7_938_e2_1012.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_6_e7_938_e2_1012(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_6_e8_1147_e2_1326.lus b/lustrec_tests/lustre_files/SYNAPSE_6_e8_1147_e2_1326.lus
index fadb8d1f..943d7ebb 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_6_e8_1147_e2_1326.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_6_e8_1147_e2_1326.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_6_e8_1147_e2_1326(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all.lus b/lustrec_tests/lustre_files/SYNAPSE_all.lus
index 242cd743..c4804d5a 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all.lus
@@ -46,7 +46,7 @@ let
 
 tel
 
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e3_1750.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e3_1750.lus
index e78e3680..1b7c2e18 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e3_1750.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e3_1750.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e3_1750(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e3_495.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e3_495.lus
index 444f19e6..2bfefb50 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e3_495.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e3_495.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e3_1864_e3_495(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e4_34.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e4_34.lus
index 857d815f..df9fa8b7 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e4_34.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e4_34.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e3_1864_e4_34(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e5_1637.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e5_1637.lus
index 8febd9ea..024c10ab 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e5_1637.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e5_1637.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e3_1864_e5_1637(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e7_251.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e7_251.lus
index 612756ec..34681319 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e7_251.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e3_1864_e7_251.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e3_1864_e7_251(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e7_907.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e7_907.lus
index c0f80f51..3b087cf8 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e7_907.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e7_907.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e7_907(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e7_907_e7_1363.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e7_907_e7_1363.lus
index 7e5d80c2..d4ba9ed0 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e7_907_e7_1363.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e7_907_e7_1363.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e7_907_e7_1363(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e8_251.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e8_251.lus
index 401f4b4e..5568c798 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e8_251.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e8_251.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e8_251(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e1_1852.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e1_1852.lus
index 602e9c44..c36e9819 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e1_1852.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e1_1852.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e8_251_e1_1852(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e2_1053.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e2_1053.lus
index d223b0b7..91389e95 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e2_1053.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e2_1053.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e8_251_e2_1053(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e3_1472.lus b/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e3_1472.lus
index 9e028c43..b87c3828 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e3_1472.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_all_e8_251_e3_1472.lus
@@ -35,7 +35,7 @@ let
 	if(e_s3) then if(garde_s3) then 1 else pre dirty_s else 
 	pre dirty_s;
 tel
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_all_e8_251_e3_1472(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/SYNAPSE_i1.lus b/lustrec_tests/lustre_files/SYNAPSE_i1.lus
index 9a330527..c70dcafc 100644
--- a/lustrec_tests/lustre_files/SYNAPSE_i1.lus
+++ b/lustrec_tests/lustre_files/SYNAPSE_i1.lus
@@ -42,7 +42,7 @@ let
 
 tel
 
-node top(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
+node SYNAPSE_i1(e_s1, e_s2, e_s3 : bool; init_invalid_s : int)
 returns( OK : bool );
 --@ contract guarantee OK;
     var invalid_s, valid_s, dirty_s : int; mem_init_s : int;
diff --git a/lustrec_tests/lustre_files/_6counter2.lus b/lustrec_tests/lustre_files/_6counter2.lus
index c336b8b5..0f9854ef 100644
--- a/lustrec_tests/lustre_files/_6counter2.lus
+++ b/lustrec_tests/lustre_files/_6counter2.lus
@@ -1,7 +1,7 @@
 -- a simple 0 to 5 boolean counter (A is LSB, C is MSB)
 -- invalid property is that it should never reach 5 or 7
 
-node top (x:bool) returns (OK:bool);
+node _6counter2 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var a,b,c:bool;
 let
diff --git a/lustrec_tests/lustre_files/_6countern.lus b/lustrec_tests/lustre_files/_6countern.lus
index 3c911da6..061ce706 100644
--- a/lustrec_tests/lustre_files/_6countern.lus
+++ b/lustrec_tests/lustre_files/_6countern.lus
@@ -1,4 +1,4 @@
-node top (init:int) returns (OK:bool);
+node _6countern (init:int) returns (OK:bool);
 --@ contract guarantee OK;
 var time:int;
 let
diff --git a/lustrec_tests/lustre_files/_6counters.lus b/lustrec_tests/lustre_files/_6counters.lus
index 7c6cf6d5..dc9518e7 100644
--- a/lustrec_tests/lustre_files/_6counters.lus
+++ b/lustrec_tests/lustre_files/_6counters.lus
@@ -22,7 +22,7 @@ tel
 
 
 
-node top (x:bool) returns (OK:bool);
+node _6counters (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var a,b:bool;
 let
diff --git a/lustrec_tests/lustre_files/_6counters_e3_140_e8_149.lus b/lustrec_tests/lustre_files/_6counters_e3_140_e8_149.lus
index 17eb7368..743f34c7 100644
--- a/lustrec_tests/lustre_files/_6counters_e3_140_e8_149.lus
+++ b/lustrec_tests/lustre_files/_6counters_e3_140_e8_149.lus
@@ -17,7 +17,7 @@ let
 tel
 
 
-node top (x:bool) returns (OK:bool);
+node _6counters_e3_140_e8_149 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var a,b:bool;
 let
diff --git a/lustrec_tests/lustre_files/_6counters_e8_371_e1_448.lus b/lustrec_tests/lustre_files/_6counters_e8_371_e1_448.lus
index 611045d8..3341bc58 100644
--- a/lustrec_tests/lustre_files/_6counters_e8_371_e1_448.lus
+++ b/lustrec_tests/lustre_files/_6counters_e8_371_e1_448.lus
@@ -16,7 +16,7 @@ let
   out = time = 5;
 tel
 
-node top (x:bool) returns (OK:bool);
+node _6counters_e8_371_e1_448 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var a,b:bool;
 let
diff --git a/lustrec_tests/lustre_files/_6counters_e8_371_e2_80.lus b/lustrec_tests/lustre_files/_6counters_e8_371_e2_80.lus
index e2bde05b..bbb0049e 100644
--- a/lustrec_tests/lustre_files/_6counters_e8_371_e2_80.lus
+++ b/lustrec_tests/lustre_files/_6counters_e8_371_e2_80.lus
@@ -16,7 +16,7 @@ let
   out = time = 5;
 tel
 
-node top (x:bool) returns (OK:bool);
+node _6counters_e8_371_e2_80 (x:bool) returns (OK:bool);
 --@ contract guarantee OK by 1-induction;
 var a,b:bool;
 let
diff --git a/lustrec_tests/lustre_files/_6counters_e8_371_e3_224.lus b/lustrec_tests/lustre_files/_6counters_e8_371_e3_224.lus
index 4347ce63..1de99bfc 100644
--- a/lustrec_tests/lustre_files/_6counters_e8_371_e3_224.lus
+++ b/lustrec_tests/lustre_files/_6counters_e8_371_e3_224.lus
@@ -16,7 +16,7 @@ let
   out = time = 5;
 tel
 
-node top (x:bool) returns (OK:bool);
+node _6counters_e8_371_e3_224 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var a,b:bool;
 let
diff --git a/lustrec_tests/lustre_files/_6counters_e8_371_e7_304.lus b/lustrec_tests/lustre_files/_6counters_e8_371_e7_304.lus
index d2a723de..7cc2e98b 100644
--- a/lustrec_tests/lustre_files/_6counters_e8_371_e7_304.lus
+++ b/lustrec_tests/lustre_files/_6counters_e8_371_e7_304.lus
@@ -16,7 +16,7 @@ let
   out = time = 5;
 tel
 
-node top (x:bool) returns (OK:bool);
+node _6counters_e8_371_e7_304 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var a,b:bool;
 let
diff --git a/lustrec_tests/lustre_files/car_1.lus b/lustrec_tests/lustre_files/car_1.lus
index 7724d512..9d9f42cc 100644
--- a/lustrec_tests/lustre_files/car_1.lus
+++ b/lustrec_tests/lustre_files/car_1.lus
@@ -34,7 +34,7 @@ let
 
 tel
 
-node top(m, s : bool) returns (OK : bool);
+node car_1(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_1_e7_184_e3_299.lus b/lustrec_tests/lustre_files/car_1_e7_184_e3_299.lus
index c1fb4dee..ea6b6534 100644
--- a/lustrec_tests/lustre_files/car_1_e7_184_e3_299.lus
+++ b/lustrec_tests/lustre_files/car_1_e7_184_e3_299.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_1_e7_184_e3_299(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_2.lus b/lustrec_tests/lustre_files/car_2.lus
index 29cff96d..397853ed 100644
--- a/lustrec_tests/lustre_files/car_2.lus
+++ b/lustrec_tests/lustre_files/car_2.lus
@@ -36,7 +36,7 @@ let
 tel
 
 
-node top(m, s : bool) returns (OK : bool);
+node car_2(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_2_e7_1027_e1_1047.lus b/lustrec_tests/lustre_files/car_2_e7_1027_e1_1047.lus
index f9c77533..9b9c6d25 100644
--- a/lustrec_tests/lustre_files/car_2_e7_1027_e1_1047.lus
+++ b/lustrec_tests/lustre_files/car_2_e7_1027_e1_1047.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_2_e7_1027_e1_1047(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_2_e7_1027_e7_359.lus b/lustrec_tests/lustre_files/car_2_e7_1027_e7_359.lus
index b000aa54..229c1f71 100644
--- a/lustrec_tests/lustre_files/car_2_e7_1027_e7_359.lus
+++ b/lustrec_tests/lustre_files/car_2_e7_1027_e7_359.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_2_e7_1027_e7_359(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_2_e8_491_e7_826.lus b/lustrec_tests/lustre_files/car_2_e8_491_e7_826.lus
index ca5724b1..9005f3bc 100644
--- a/lustrec_tests/lustre_files/car_2_e8_491_e7_826.lus
+++ b/lustrec_tests/lustre_files/car_2_e8_491_e7_826.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_2_e8_491_e7_826(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3.lus b/lustrec_tests/lustre_files/car_3.lus
index c2db03c2..bf1116f1 100644
--- a/lustrec_tests/lustre_files/car_3.lus
+++ b/lustrec_tests/lustre_files/car_3.lus
@@ -36,7 +36,7 @@ let
 tel
 
 
-node top(m, s : bool) returns (OK : bool);
+node car_3(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3_e1_586.lus b/lustrec_tests/lustre_files/car_3_e1_586.lus
index 8f36fb36..60f3ba7e 100644
--- a/lustrec_tests/lustre_files/car_3_e1_586.lus
+++ b/lustrec_tests/lustre_files/car_3_e1_586.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_3_e1_586(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3_e1_924.lus b/lustrec_tests/lustre_files/car_3_e1_924.lus
index 8f36fb36..b883e412 100644
--- a/lustrec_tests/lustre_files/car_3_e1_924.lus
+++ b/lustrec_tests/lustre_files/car_3_e1_924.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_3_e1_924(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3_e2_695.lus b/lustrec_tests/lustre_files/car_3_e2_695.lus
index b06a55f5..2c73ea6d 100644
--- a/lustrec_tests/lustre_files/car_3_e2_695.lus
+++ b/lustrec_tests/lustre_files/car_3_e2_695.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_3_e2_695(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3_e2_777.lus b/lustrec_tests/lustre_files/car_3_e2_777.lus
index b06a55f5..e9ff9b6e 100644
--- a/lustrec_tests/lustre_files/car_3_e2_777.lus
+++ b/lustrec_tests/lustre_files/car_3_e2_777.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_3_e2_777(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3_e7_626.lus b/lustrec_tests/lustre_files/car_3_e7_626.lus
index c7da573c..26c7e4f3 100644
--- a/lustrec_tests/lustre_files/car_3_e7_626.lus
+++ b/lustrec_tests/lustre_files/car_3_e7_626.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_3_e7_626(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3_e7_626_e1_305.lus b/lustrec_tests/lustre_files/car_3_e7_626_e1_305.lus
index b13b3d41..db91948d 100644
--- a/lustrec_tests/lustre_files/car_3_e7_626_e1_305.lus
+++ b/lustrec_tests/lustre_files/car_3_e7_626_e1_305.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_3_e7_626_e1_305(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3_e8_33.lus b/lustrec_tests/lustre_files/car_3_e8_33.lus
index 88720c0e..6d89d773 100644
--- a/lustrec_tests/lustre_files/car_3_e8_33.lus
+++ b/lustrec_tests/lustre_files/car_3_e8_33.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_3_e8_33(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3_e8_33_e1_856.lus b/lustrec_tests/lustre_files/car_3_e8_33_e1_856.lus
index 9c631098..f5a504e4 100644
--- a/lustrec_tests/lustre_files/car_3_e8_33_e1_856.lus
+++ b/lustrec_tests/lustre_files/car_3_e8_33_e1_856.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_3_e8_33_e1_856(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3_e8_33_e2_1010.lus b/lustrec_tests/lustre_files/car_3_e8_33_e2_1010.lus
index a9a4d34c..d185529d 100644
--- a/lustrec_tests/lustre_files/car_3_e8_33_e2_1010.lus
+++ b/lustrec_tests/lustre_files/car_3_e8_33_e2_1010.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_3_e8_33_e2_1010(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_3_e8_33_e7_220.lus b/lustrec_tests/lustre_files/car_3_e8_33_e7_220.lus
index ad0186de..47a6795d 100644
--- a/lustrec_tests/lustre_files/car_3_e8_33_e7_220.lus
+++ b/lustrec_tests/lustre_files/car_3_e8_33_e7_220.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_3_e8_33_e7_220(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 3-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4.lus b/lustrec_tests/lustre_files/car_4.lus
index 6057cd46..8ef1ebf3 100644
--- a/lustrec_tests/lustre_files/car_4.lus
+++ b/lustrec_tests/lustre_files/car_4.lus
@@ -34,7 +34,7 @@ let
 
 tel
 
-node top(m, s : bool) returns (OK : bool);
+node car_4(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e3_556.lus b/lustrec_tests/lustre_files/car_4_e3_556.lus
index feaa0f53..619b7665 100644
--- a/lustrec_tests/lustre_files/car_4_e3_556.lus
+++ b/lustrec_tests/lustre_files/car_4_e3_556.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e3_556(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e3_57.lus b/lustrec_tests/lustre_files/car_4_e3_57.lus
index feaa0f53..62d73420 100644
--- a/lustrec_tests/lustre_files/car_4_e3_57.lus
+++ b/lustrec_tests/lustre_files/car_4_e3_57.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e3_57(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e3_57_e4_1047.lus b/lustrec_tests/lustre_files/car_4_e3_57_e4_1047.lus
index 97990ede..25737b51 100644
--- a/lustrec_tests/lustre_files/car_4_e3_57_e4_1047.lus
+++ b/lustrec_tests/lustre_files/car_4_e3_57_e4_1047.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e3_57_e4_1047(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e3_57_e5_999.lus b/lustrec_tests/lustre_files/car_4_e3_57_e5_999.lus
index 0cdebc56..8a1c3d72 100644
--- a/lustrec_tests/lustre_files/car_4_e3_57_e5_999.lus
+++ b/lustrec_tests/lustre_files/car_4_e3_57_e5_999.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e3_57_e5_999(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e3_57_e6_784.lus b/lustrec_tests/lustre_files/car_4_e3_57_e6_784.lus
index 60809ce9..d459b651 100644
--- a/lustrec_tests/lustre_files/car_4_e3_57_e6_784.lus
+++ b/lustrec_tests/lustre_files/car_4_e3_57_e6_784.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e3_57_e6_784(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e7_592.lus b/lustrec_tests/lustre_files/car_4_e7_592.lus
index 8322086f..89dfee65 100644
--- a/lustrec_tests/lustre_files/car_4_e7_592.lus
+++ b/lustrec_tests/lustre_files/car_4_e7_592.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e7_592(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e7_592_e3_442.lus b/lustrec_tests/lustre_files/car_4_e7_592_e3_442.lus
index 67426221..fd8e1f73 100644
--- a/lustrec_tests/lustre_files/car_4_e7_592_e3_442.lus
+++ b/lustrec_tests/lustre_files/car_4_e7_592_e3_442.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e7_592_e3_442(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e7_592_e7_265.lus b/lustrec_tests/lustre_files/car_4_e7_592_e7_265.lus
index ce4567a5..e768ffec 100644
--- a/lustrec_tests/lustre_files/car_4_e7_592_e7_265.lus
+++ b/lustrec_tests/lustre_files/car_4_e7_592_e7_265.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e7_592_e7_265(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e8_118.lus b/lustrec_tests/lustre_files/car_4_e8_118.lus
index 9ee81887..f97ef1d8 100644
--- a/lustrec_tests/lustre_files/car_4_e8_118.lus
+++ b/lustrec_tests/lustre_files/car_4_e8_118.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e8_118(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e8_118_e3_514.lus b/lustrec_tests/lustre_files/car_4_e8_118_e3_514.lus
index 947c0cb4..f58abc7d 100644
--- a/lustrec_tests/lustre_files/car_4_e8_118_e3_514.lus
+++ b/lustrec_tests/lustre_files/car_4_e8_118_e3_514.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e8_118_e3_514(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_4_e8_118_e7_178.lus b/lustrec_tests/lustre_files/car_4_e8_118_e7_178.lus
index 30f042b1..6411388d 100644
--- a/lustrec_tests/lustre_files/car_4_e8_118_e7_178.lus
+++ b/lustrec_tests/lustre_files/car_4_e8_118_e7_178.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_4_e8_118_e7_178(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5.lus b/lustrec_tests/lustre_files/car_5.lus
index c5dffd2a..ce043ab2 100644
--- a/lustrec_tests/lustre_files/car_5.lus
+++ b/lustrec_tests/lustre_files/car_5.lus
@@ -37,7 +37,7 @@ tel
 
 
 -- Can't prove in luke-bitvec, luke-hybrid, nbac
-node top(m, s : bool) returns (OK : bool);
+node car_5(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5_e2_405_e2_1083.lus b/lustrec_tests/lustre_files/car_5_e2_405_e2_1083.lus
index a790ff1d..74ec46e9 100644
--- a/lustrec_tests/lustre_files/car_5_e2_405_e2_1083.lus
+++ b/lustrec_tests/lustre_files/car_5_e2_405_e2_1083.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_5_e2_405_e2_1083(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5_e2_405_e3_473.lus b/lustrec_tests/lustre_files/car_5_e2_405_e3_473.lus
index d6c7a724..5e1b7f4d 100644
--- a/lustrec_tests/lustre_files/car_5_e2_405_e3_473.lus
+++ b/lustrec_tests/lustre_files/car_5_e2_405_e3_473.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_5_e2_405_e3_473(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5_e2_405_e8_1055.lus b/lustrec_tests/lustre_files/car_5_e2_405_e8_1055.lus
index 4fd4b371..1a5a6327 100644
--- a/lustrec_tests/lustre_files/car_5_e2_405_e8_1055.lus
+++ b/lustrec_tests/lustre_files/car_5_e2_405_e8_1055.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_5_e2_405_e8_1055(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5_e3_11_e1_429.lus b/lustrec_tests/lustre_files/car_5_e3_11_e1_429.lus
index 8ac99263..3cdf598d 100644
--- a/lustrec_tests/lustre_files/car_5_e3_11_e1_429.lus
+++ b/lustrec_tests/lustre_files/car_5_e3_11_e1_429.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_5_e3_11_e1_429(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5_e3_11_e5_24.lus b/lustrec_tests/lustre_files/car_5_e3_11_e5_24.lus
index 4c46ad5b..8842eedb 100644
--- a/lustrec_tests/lustre_files/car_5_e3_11_e5_24.lus
+++ b/lustrec_tests/lustre_files/car_5_e3_11_e5_24.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_5_e3_11_e5_24(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5_e3_661.lus b/lustrec_tests/lustre_files/car_5_e3_661.lus
index ddcf7379..0439644c 100644
--- a/lustrec_tests/lustre_files/car_5_e3_661.lus
+++ b/lustrec_tests/lustre_files/car_5_e3_661.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_5_e3_661(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5_e7_244.lus b/lustrec_tests/lustre_files/car_5_e7_244.lus
index b67f938f..05f0f05d 100644
--- a/lustrec_tests/lustre_files/car_5_e7_244.lus
+++ b/lustrec_tests/lustre_files/car_5_e7_244.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_5_e7_244(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5_e7_244_e1_823.lus b/lustrec_tests/lustre_files/car_5_e7_244_e1_823.lus
index 99c0cf77..93d2b681 100644
--- a/lustrec_tests/lustre_files/car_5_e7_244_e1_823.lus
+++ b/lustrec_tests/lustre_files/car_5_e7_244_e1_823.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_5_e7_244_e1_823(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5_e7_244_e2_693.lus b/lustrec_tests/lustre_files/car_5_e7_244_e2_693.lus
index 320ade1c..a63c3450 100644
--- a/lustrec_tests/lustre_files/car_5_e7_244_e2_693.lus
+++ b/lustrec_tests/lustre_files/car_5_e7_244_e2_693.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_5_e7_244_e2_693(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_5_e7_244_e3_1071.lus b/lustrec_tests/lustre_files/car_5_e7_244_e3_1071.lus
index b5bc82a7..94a0798b 100644
--- a/lustrec_tests/lustre_files/car_5_e7_244_e3_1071.lus
+++ b/lustrec_tests/lustre_files/car_5_e7_244_e3_1071.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_5_e7_244_e3_1071(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_6.lus b/lustrec_tests/lustre_files/car_6.lus
index 93cb69f8..4c03c575 100644
--- a/lustrec_tests/lustre_files/car_6.lus
+++ b/lustrec_tests/lustre_files/car_6.lus
@@ -37,7 +37,7 @@ tel
 
 
 -- Can't prove in luke-bitvec, luke-hybrid, nbac
-node top(m, s : bool) returns (OK : bool);
+node car_6(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_6_e1_152.lus b/lustrec_tests/lustre_files/car_6_e1_152.lus
index 35ee0cbd..89066d7b 100644
--- a/lustrec_tests/lustre_files/car_6_e1_152.lus
+++ b/lustrec_tests/lustre_files/car_6_e1_152.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_6_e1_152(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_6_e1_152_e1_391.lus b/lustrec_tests/lustre_files/car_6_e1_152_e1_391.lus
index b60a5d45..0ea10932 100644
--- a/lustrec_tests/lustre_files/car_6_e1_152_e1_391.lus
+++ b/lustrec_tests/lustre_files/car_6_e1_152_e1_391.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_6_e1_152_e1_391(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_6_e2_589_e2_506.lus b/lustrec_tests/lustre_files/car_6_e2_589_e2_506.lus
index 4af80e43..86a7ea91 100644
--- a/lustrec_tests/lustre_files/car_6_e2_589_e2_506.lus
+++ b/lustrec_tests/lustre_files/car_6_e2_589_e2_506.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_6_e2_589_e2_506(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_6_e2_589_e3_349.lus b/lustrec_tests/lustre_files/car_6_e2_589_e3_349.lus
index 0611de15..96644142 100644
--- a/lustrec_tests/lustre_files/car_6_e2_589_e3_349.lus
+++ b/lustrec_tests/lustre_files/car_6_e2_589_e3_349.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_6_e2_589_e3_349(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_6_e2_893.lus b/lustrec_tests/lustre_files/car_6_e2_893.lus
index a3a29d06..9d0d0b66 100644
--- a/lustrec_tests/lustre_files/car_6_e2_893.lus
+++ b/lustrec_tests/lustre_files/car_6_e2_893.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_6_e2_893(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_6_e3_294_e1_956.lus b/lustrec_tests/lustre_files/car_6_e3_294_e1_956.lus
index 00454ab0..82353752 100644
--- a/lustrec_tests/lustre_files/car_6_e3_294_e1_956.lus
+++ b/lustrec_tests/lustre_files/car_6_e3_294_e1_956.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_6_e3_294_e1_956(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_6_e3_294_e3_47.lus b/lustrec_tests/lustre_files/car_6_e3_294_e3_47.lus
index c76caea8..7a1f734f 100644
--- a/lustrec_tests/lustre_files/car_6_e3_294_e3_47.lus
+++ b/lustrec_tests/lustre_files/car_6_e3_294_e3_47.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_6_e3_294_e3_47(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_6_e3_294_e5_979.lus b/lustrec_tests/lustre_files/car_6_e3_294_e5_979.lus
index 5a44dd63..b42dec82 100644
--- a/lustrec_tests/lustre_files/car_6_e3_294_e5_979.lus
+++ b/lustrec_tests/lustre_files/car_6_e3_294_e5_979.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_6_e3_294_e5_979(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all.lus b/lustrec_tests/lustre_files/car_all.lus
index b1be79aa..1311a92d 100644
--- a/lustrec_tests/lustre_files/car_all.lus
+++ b/lustrec_tests/lustre_files/car_all.lus
@@ -30,7 +30,7 @@ let
 
 tel
 
-node top(m, s : bool) returns (OK : bool);
+node car_all(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e1_618.lus b/lustrec_tests/lustre_files/car_all_e1_618.lus
index 8c4360ef..92669ad3 100644
--- a/lustrec_tests/lustre_files/car_all_e1_618.lus
+++ b/lustrec_tests/lustre_files/car_all_e1_618.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e1_618(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e1_618_e3_303.lus b/lustrec_tests/lustre_files/car_all_e1_618_e3_303.lus
index 0375dde5..ec703bfe 100644
--- a/lustrec_tests/lustre_files/car_all_e1_618_e3_303.lus
+++ b/lustrec_tests/lustre_files/car_all_e1_618_e3_303.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e1_618_e3_303(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e2_142.lus b/lustrec_tests/lustre_files/car_all_e2_142.lus
index a4fe26d4..1e803de0 100644
--- a/lustrec_tests/lustre_files/car_all_e2_142.lus
+++ b/lustrec_tests/lustre_files/car_all_e2_142.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e2_142(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e2_142_e7_209.lus b/lustrec_tests/lustre_files/car_all_e2_142_e7_209.lus
index ed9cacac..fd840b6c 100644
--- a/lustrec_tests/lustre_files/car_all_e2_142_e7_209.lus
+++ b/lustrec_tests/lustre_files/car_all_e2_142_e7_209.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e2_142_e7_209(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e3_1068.lus b/lustrec_tests/lustre_files/car_all_e3_1068.lus
index 968660ac..4d70a8de 100644
--- a/lustrec_tests/lustre_files/car_all_e3_1068.lus
+++ b/lustrec_tests/lustre_files/car_all_e3_1068.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e3_1068(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e3_1068_e1_178.lus b/lustrec_tests/lustre_files/car_all_e3_1068_e1_178.lus
index 2ab3102b..03ba7596 100644
--- a/lustrec_tests/lustre_files/car_all_e3_1068_e1_178.lus
+++ b/lustrec_tests/lustre_files/car_all_e3_1068_e1_178.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e3_1068_e1_178(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e3_1068_e2_13.lus b/lustrec_tests/lustre_files/car_all_e3_1068_e2_13.lus
index 8f89395e..b22de2f3 100644
--- a/lustrec_tests/lustre_files/car_all_e3_1068_e2_13.lus
+++ b/lustrec_tests/lustre_files/car_all_e3_1068_e2_13.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e3_1068_e2_13(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e3_1068_e3_163.lus b/lustrec_tests/lustre_files/car_all_e3_1068_e3_163.lus
index 6fab58f4..da95c878 100644
--- a/lustrec_tests/lustre_files/car_all_e3_1068_e3_163.lus
+++ b/lustrec_tests/lustre_files/car_all_e3_1068_e3_163.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e3_1068_e3_163(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e3_1068_e4_275.lus b/lustrec_tests/lustre_files/car_all_e3_1068_e4_275.lus
index 228d9bb0..e6933788 100644
--- a/lustrec_tests/lustre_files/car_all_e3_1068_e4_275.lus
+++ b/lustrec_tests/lustre_files/car_all_e3_1068_e4_275.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e3_1068_e4_275(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e3_1068_e5_882.lus b/lustrec_tests/lustre_files/car_all_e3_1068_e5_882.lus
index 59c6c94a..89fafb3e 100644
--- a/lustrec_tests/lustre_files/car_all_e3_1068_e5_882.lus
+++ b/lustrec_tests/lustre_files/car_all_e3_1068_e5_882.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e3_1068_e5_882(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e7_188_e7_743.lus b/lustrec_tests/lustre_files/car_all_e7_188_e7_743.lus
index b609c107..0708477c 100644
--- a/lustrec_tests/lustre_files/car_all_e7_188_e7_743.lus
+++ b/lustrec_tests/lustre_files/car_all_e7_188_e7_743.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e7_188_e7_743(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e8_856.lus b/lustrec_tests/lustre_files/car_all_e8_856.lus
index 0d08f572..ecb4bc2b 100644
--- a/lustrec_tests/lustre_files/car_all_e8_856.lus
+++ b/lustrec_tests/lustre_files/car_all_e8_856.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e8_856(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e8_856_e1_217.lus b/lustrec_tests/lustre_files/car_all_e8_856_e1_217.lus
index 478a59ad..5891b8a5 100644
--- a/lustrec_tests/lustre_files/car_all_e8_856_e1_217.lus
+++ b/lustrec_tests/lustre_files/car_all_e8_856_e1_217.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e8_856_e1_217(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e8_856_e2_585.lus b/lustrec_tests/lustre_files/car_all_e8_856_e2_585.lus
index 418f81c0..cbcde3fe 100644
--- a/lustrec_tests/lustre_files/car_all_e8_856_e2_585.lus
+++ b/lustrec_tests/lustre_files/car_all_e8_856_e2_585.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e8_856_e2_585(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e8_856_e3_180.lus b/lustrec_tests/lustre_files/car_all_e8_856_e3_180.lus
index 7c077c48..6df502f1 100644
--- a/lustrec_tests/lustre_files/car_all_e8_856_e3_180.lus
+++ b/lustrec_tests/lustre_files/car_all_e8_856_e3_180.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e8_856_e3_180(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/car_all_e8_856_e7_578.lus b/lustrec_tests/lustre_files/car_all_e8_856_e7_578.lus
index 6098c76c..f63be81d 100644
--- a/lustrec_tests/lustre_files/car_all_e8_856_e7_578.lus
+++ b/lustrec_tests/lustre_files/car_all_e8_856_e7_578.lus
@@ -26,7 +26,7 @@ let
   stop = time >= 4;
   bump = dist = 10;
 tel
-node top(m, s : bool) returns (OK : bool);
+node car_all_e8_856_e7_578(m, s : bool) returns (OK : bool);
 --@ contract guarantee OK;
 var toofast, stop, bump: bool;
     dist, speed, time: int;
diff --git a/lustrec_tests/lustre_files/ccp02.lus b/lustrec_tests/lustre_files/ccp02.lus
index 203645ad..50ad06b4 100644
--- a/lustrec_tests/lustre_files/ccp02.lus
+++ b/lustrec_tests/lustre_files/ccp02.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp02(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp03.lus b/lustrec_tests/lustre_files/ccp03.lus
index 74887a35..e9f747f0 100644
--- a/lustrec_tests/lustre_files/ccp03.lus
+++ b/lustrec_tests/lustre_files/ccp03.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp03(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp04.lus b/lustrec_tests/lustre_files/ccp04.lus
index c010cb42..3c853479 100644
--- a/lustrec_tests/lustre_files/ccp04.lus
+++ b/lustrec_tests/lustre_files/ccp04.lus
@@ -1,5 +1,5 @@
 
-node top(onOff: bool; 
+node ccp04(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp05.lus b/lustrec_tests/lustre_files/ccp05.lus
index 83a3eccb..18694eb3 100644
--- a/lustrec_tests/lustre_files/ccp05.lus
+++ b/lustrec_tests/lustre_files/ccp05.lus
@@ -1,5 +1,5 @@
 
-node top(onOff: bool; 
+node ccp05(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp06.lus b/lustrec_tests/lustre_files/ccp06.lus
index a11e2451..67f540e5 100644
--- a/lustrec_tests/lustre_files/ccp06.lus
+++ b/lustrec_tests/lustre_files/ccp06.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp06(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp07.lus b/lustrec_tests/lustre_files/ccp07.lus
index c22dea3c..e5c8dd9a 100644
--- a/lustrec_tests/lustre_files/ccp07.lus
+++ b/lustrec_tests/lustre_files/ccp07.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp07(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp08.lus b/lustrec_tests/lustre_files/ccp08.lus
index 93b438ee..45c1fae7 100644
--- a/lustrec_tests/lustre_files/ccp08.lus
+++ b/lustrec_tests/lustre_files/ccp08.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp08(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp09.lus b/lustrec_tests/lustre_files/ccp09.lus
index 93e240eb..30692655 100644
--- a/lustrec_tests/lustre_files/ccp09.lus
+++ b/lustrec_tests/lustre_files/ccp09.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp09(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp10.lus b/lustrec_tests/lustre_files/ccp10.lus
index 5cd9c9a1..8af8bc86 100644
--- a/lustrec_tests/lustre_files/ccp10.lus
+++ b/lustrec_tests/lustre_files/ccp10.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp10(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp11.lus b/lustrec_tests/lustre_files/ccp11.lus
index ba31a8e1..b0cb6cdb 100644
--- a/lustrec_tests/lustre_files/ccp11.lus
+++ b/lustrec_tests/lustre_files/ccp11.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp11(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp12.lus b/lustrec_tests/lustre_files/ccp12.lus
index 8b9a5bf6..453a1df4 100644
--- a/lustrec_tests/lustre_files/ccp12.lus
+++ b/lustrec_tests/lustre_files/ccp12.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp12(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp13.lus b/lustrec_tests/lustre_files/ccp13.lus
index f74032b0..07bbe593 100644
--- a/lustrec_tests/lustre_files/ccp13.lus
+++ b/lustrec_tests/lustre_files/ccp13.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp13(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp14.lus b/lustrec_tests/lustre_files/ccp14.lus
index c39644b6..7cc3a1d1 100644
--- a/lustrec_tests/lustre_files/ccp14.lus
+++ b/lustrec_tests/lustre_files/ccp14.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp14(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp15.lus b/lustrec_tests/lustre_files/ccp15.lus
index ef1dadd9..4766bfbb 100644
--- a/lustrec_tests/lustre_files/ccp15.lus
+++ b/lustrec_tests/lustre_files/ccp15.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp15(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp16.lus b/lustrec_tests/lustre_files/ccp16.lus
index f46f87e3..96683902 100644
--- a/lustrec_tests/lustre_files/ccp16.lus
+++ b/lustrec_tests/lustre_files/ccp16.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp16(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp17.lus b/lustrec_tests/lustre_files/ccp17.lus
index c517ec42..808ab74c 100644
--- a/lustrec_tests/lustre_files/ccp17.lus
+++ b/lustrec_tests/lustre_files/ccp17.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp17(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp18.lus b/lustrec_tests/lustre_files/ccp18.lus
index d0ae894c..b559632b 100644
--- a/lustrec_tests/lustre_files/ccp18.lus
+++ b/lustrec_tests/lustre_files/ccp18.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp18(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp19.lus b/lustrec_tests/lustre_files/ccp19.lus
index bf480be0..42b0c8bd 100644
--- a/lustrec_tests/lustre_files/ccp19.lus
+++ b/lustrec_tests/lustre_files/ccp19.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp19(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp20.lus b/lustrec_tests/lustre_files/ccp20.lus
index 38026c24..595b9479 100644
--- a/lustrec_tests/lustre_files/ccp20.lus
+++ b/lustrec_tests/lustre_files/ccp20.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp20(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp21.lus b/lustrec_tests/lustre_files/ccp21.lus
index 045e3d98..d0418922 100644
--- a/lustrec_tests/lustre_files/ccp21.lus
+++ b/lustrec_tests/lustre_files/ccp21.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp21(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp22.lus b/lustrec_tests/lustre_files/ccp22.lus
index 45cb70e7..fcdb0f11 100644
--- a/lustrec_tests/lustre_files/ccp22.lus
+++ b/lustrec_tests/lustre_files/ccp22.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp22(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp23.lus b/lustrec_tests/lustre_files/ccp23.lus
index 17b2819e..79ae8f83 100644
--- a/lustrec_tests/lustre_files/ccp23.lus
+++ b/lustrec_tests/lustre_files/ccp23.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp23(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/ccp24.lus b/lustrec_tests/lustre_files/ccp24.lus
index 4ae33180..8d81eda8 100644
--- a/lustrec_tests/lustre_files/ccp24.lus
+++ b/lustrec_tests/lustre_files/ccp24.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node ccp24(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cd.lus b/lustrec_tests/lustre_files/cd.lus
index ec4e03d0..dc66073a 100644
--- a/lustrec_tests/lustre_files/cd.lus
+++ b/lustrec_tests/lustre_files/cd.lus
@@ -30,7 +30,7 @@ let
   ok = true -> (pre cpt<=7);
 tel
 
-node top(diff:int) returns (OK: bool);
+node cd(diff:int) returns (OK: bool);
 --@ contract guarantee OK by 10-induction;
 var speed: int; 
     plus,minus,realistic: bool;
diff --git a/lustrec_tests/lustre_files/cd_e7_621_e7_669.lus b/lustrec_tests/lustre_files/cd_e7_621_e7_669.lus
index 63449989..c6a31708 100644
--- a/lustrec_tests/lustre_files/cd_e7_621_e7_669.lus
+++ b/lustrec_tests/lustre_files/cd_e7_621_e7_669.lus
@@ -23,7 +23,7 @@ let
   cpt = 0 -> if acceptable then 0 else pre(cpt)+1;
   ok = true -> (pre cpt<=7);
 tel
-node top(diff:int) returns (OK: bool);
+node cd_e7_621_e7_669(diff:int) returns (OK: bool);
 --@ contract guarantee OK;
 var speed: int; 
     plus,minus,realistic: bool;
diff --git a/lustrec_tests/lustre_files/cd_e7_8.lus b/lustrec_tests/lustre_files/cd_e7_8.lus
index 587d063a..f196b07e 100644
--- a/lustrec_tests/lustre_files/cd_e7_8.lus
+++ b/lustrec_tests/lustre_files/cd_e7_8.lus
@@ -23,7 +23,7 @@ let
   cpt = 0 -> if acceptable then 0 else pre(cpt)+1;
   ok = true -> (pre cpt<=7);
 tel
-node top(diff:int) returns (OK: bool);
+node cd_e7_8(diff:int) returns (OK: bool);
 --@ contract guarantee OK;
 var speed: int; 
     plus,minus,realistic: bool;
diff --git a/lustrec_tests/lustre_files/chain4_1.lus b/lustrec_tests/lustre_files/chain4_1.lus
index bfcaef7c..f7f289e2 100644
--- a/lustrec_tests/lustre_files/chain4_1.lus
+++ b/lustrec_tests/lustre_files/chain4_1.lus
@@ -1,4 +1,4 @@
-node top(in4_0 : real) returns (x4_0, x4_1, x4_2, in1_0, x1_0, x1_1 : real);
+node chain4_1(in4_0 : real) returns (x4_0, x4_1, x4_2, in1_0, x1_0, x1_1 : real);
 let
   assert(in4_0 >= -1. and in4_0 <= 1.);
   x4_0 = 0. -> 0.9379 * pre x4_0 - 0.0381 * pre x4_1 - 0.0414 * pre x4_2 + 0.0237 * in4_0;
diff --git a/lustrec_tests/lustre_files/chain4_4.lus b/lustrec_tests/lustre_files/chain4_4.lus
index fb9028f4..d0173f40 100644
--- a/lustrec_tests/lustre_files/chain4_4.lus
+++ b/lustrec_tests/lustre_files/chain4_4.lus
@@ -1,4 +1,4 @@
-node top(in4_0 : real) returns (x4_0, x4_1, x4_2, in42_0, x42_0, x42_1, x42_2 : real);
+node chain4_4(in4_0 : real) returns (x4_0, x4_1, x4_2, in42_0, x42_0, x42_1, x42_2 : real);
 let
   assert(in4_0 >= -1. and in4_0 <= 1.);
   x4_0 = 0. -> 0.9379 * pre x4_0 - 0.0381 * pre x4_1 - 0.0414 * pre x4_2 + 0.0237 * in4_0;
diff --git a/lustrec_tests/lustre_files/chain4_l2.lus b/lustrec_tests/lustre_files/chain4_l2.lus
index a01d0a95..7d598089 100644
--- a/lustrec_tests/lustre_files/chain4_l2.lus
+++ b/lustrec_tests/lustre_files/chain4_l2.lus
@@ -1,4 +1,4 @@
-node top(in4_0 : real) returns (x4_0, x4_1, x4_2, inl2_0, yn, ynm1, xnm1, xnm2 : real);
+node chain4_l2(in4_0 : real) returns (x4_0, x4_1, x4_2, inl2_0, yn, ynm1, xnm1, xnm2 : real);
 let
   assert(in4_0 >= -1. and in4_0 <= 1.);
   x4_0 = 0. -> 0.9379 * pre x4_0 - 0.0381 * pre x4_1 - 0.0414 * pre x4_2 + 0.0237 * in4_0;
diff --git a/lustrec_tests/lustre_files/chain5_4.lus b/lustrec_tests/lustre_files/chain5_4.lus
index 4da4c977..6deaafd9 100644
--- a/lustrec_tests/lustre_files/chain5_4.lus
+++ b/lustrec_tests/lustre_files/chain5_4.lus
@@ -1,4 +1,4 @@
-node top(in5_0, in5_1 : real) returns (x5_0, x5_1, x5_2, x5_3, in4_0, x4_0, x4_1, x4_2 : real);
+node chain5_4(in5_0, in5_1 : real) returns (x5_0, x5_1, x5_2, x5_3, in4_0, x4_0, x4_1, x4_2 : real);
 let
   assert(in5_0 >= -1. and in5_0 <= 1.);
   assert(in5_1 >= -1. and in5_1 <= 1.);
diff --git a/lustrec_tests/lustre_files/chain5_6.lus b/lustrec_tests/lustre_files/chain5_6.lus
index 77be6c6a..1d511f50 100644
--- a/lustrec_tests/lustre_files/chain5_6.lus
+++ b/lustrec_tests/lustre_files/chain5_6.lus
@@ -1,4 +1,4 @@
-node top(in5_0, in5_1 : real) returns (x5_0, x5_1, x5_2, x5_3, in6_0, x6_0, x6_1, x6_2, x6_3, x6_4 : real);
+node chain5_6(in5_0, in5_1 : real) returns (x5_0, x5_1, x5_2, x5_3, in6_0, x6_0, x6_1, x6_2, x6_3, x6_4 : real);
 let
   assert(in5_0 >= -1. and in5_0 <= 1.);
   assert(in5_1 >= -1. and in5_1 <= 1.);
diff --git a/lustrec_tests/lustre_files/chain6_l2.lus b/lustrec_tests/lustre_files/chain6_l2.lus
index cdd4781f..84fea30b 100644
--- a/lustrec_tests/lustre_files/chain6_l2.lus
+++ b/lustrec_tests/lustre_files/chain6_l2.lus
@@ -1,4 +1,4 @@
-node top(in6_0 : real) returns (x6_0, x6_1, x6_2, x6_3, x6_4, inl2_0, yn, ynm1, xnm1, xnm2 : real);
+node chain6_l2(in6_0 : real) returns (x6_0, x6_1, x6_2, x6_3, x6_4, inl2_0, yn, ynm1, xnm1, xnm2 : real);
 let
   assert(in6_0 >= -1. and in6_0 <= 1.);
   x6_0 = 0. -> 0.4250 * pre x6_0 + 0.8131 * in6_0;
diff --git a/lustrec_tests/lustre_files/counters.lus b/lustrec_tests/lustre_files/counters.lus
index dc8481fe..9d4fe024 100644
--- a/lustrec_tests/lustre_files/counters.lus
+++ b/lustrec_tests/lustre_files/counters.lus
@@ -44,7 +44,7 @@ tel
 
 
 
-node top (x:bool) returns (OK:bool);
+node counters (x:bool) returns (OK:bool);
 --@ contract guarantee OK by 5-induction;
 var a,b,d:bool;
     s:int;
diff --git a/lustrec_tests/lustre_files/cruise_controller_01.lus b/lustrec_tests/lustre_files/cruise_controller_01.lus
index d7487fdf..3ca5c300 100644
--- a/lustrec_tests/lustre_files/cruise_controller_01.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_01.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_01(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_02.lus b/lustrec_tests/lustre_files/cruise_controller_02.lus
index f0d02c50..3c0b8da4 100644
--- a/lustrec_tests/lustre_files/cruise_controller_02.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_02.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_02(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_03.lus b/lustrec_tests/lustre_files/cruise_controller_03.lus
index e4b00e9f..37d9631e 100644
--- a/lustrec_tests/lustre_files/cruise_controller_03.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_03.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_03(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_04.lus b/lustrec_tests/lustre_files/cruise_controller_04.lus
index 0cbe8e63..708e22ae 100644
--- a/lustrec_tests/lustre_files/cruise_controller_04.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_04.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_04(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_05.lus b/lustrec_tests/lustre_files/cruise_controller_05.lus
index f211180f..840ca35d 100644
--- a/lustrec_tests/lustre_files/cruise_controller_05.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_05.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_05(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_06.lus b/lustrec_tests/lustre_files/cruise_controller_06.lus
index 4af58247..046b4750 100644
--- a/lustrec_tests/lustre_files/cruise_controller_06.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_06.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_06(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_07.lus b/lustrec_tests/lustre_files/cruise_controller_07.lus
index 521d44e8..595cf728 100644
--- a/lustrec_tests/lustre_files/cruise_controller_07.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_07.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_07(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_08.lus b/lustrec_tests/lustre_files/cruise_controller_08.lus
index bf6d210d..0741ef60 100644
--- a/lustrec_tests/lustre_files/cruise_controller_08.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_08.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_08(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_09.lus b/lustrec_tests/lustre_files/cruise_controller_09.lus
index 9325ca45..529fa1e3 100644
--- a/lustrec_tests/lustre_files/cruise_controller_09.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_09.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_09(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_10.lus b/lustrec_tests/lustre_files/cruise_controller_10.lus
index 8b8aeb7a..713d51a3 100644
--- a/lustrec_tests/lustre_files/cruise_controller_10.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_10.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_10(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_11.lus b/lustrec_tests/lustre_files/cruise_controller_11.lus
index b9cfbf5d..c3c870ad 100644
--- a/lustrec_tests/lustre_files/cruise_controller_11.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_11.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_11(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_12.lus b/lustrec_tests/lustre_files/cruise_controller_12.lus
index f47e138b..3f9a5f69 100644
--- a/lustrec_tests/lustre_files/cruise_controller_12.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_12.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_12(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_13.lus b/lustrec_tests/lustre_files/cruise_controller_13.lus
index a688b0b1..209ec6cd 100644
--- a/lustrec_tests/lustre_files/cruise_controller_13.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_13.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_13(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_14.lus b/lustrec_tests/lustre_files/cruise_controller_14.lus
index 1d4c226e..b354fba0 100644
--- a/lustrec_tests/lustre_files/cruise_controller_14.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_14.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_14(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_15.lus b/lustrec_tests/lustre_files/cruise_controller_15.lus
index 2cd1ba10..611bf26a 100644
--- a/lustrec_tests/lustre_files/cruise_controller_15.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_15.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_15(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_16.lus b/lustrec_tests/lustre_files/cruise_controller_16.lus
index 8e2a4db3..7f426549 100644
--- a/lustrec_tests/lustre_files/cruise_controller_16.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_16.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_16(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_17.lus b/lustrec_tests/lustre_files/cruise_controller_17.lus
index 27dca65d..8c3926a2 100644
--- a/lustrec_tests/lustre_files/cruise_controller_17.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_17.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_17(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_18.lus b/lustrec_tests/lustre_files/cruise_controller_18.lus
index ffa8d7b8..2de2d2ac 100644
--- a/lustrec_tests/lustre_files/cruise_controller_18.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_18.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_18(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_19.lus b/lustrec_tests/lustre_files/cruise_controller_19.lus
index 96b21eb9..d4d5d178 100644
--- a/lustrec_tests/lustre_files/cruise_controller_19.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_19.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_19(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_20.lus b/lustrec_tests/lustre_files/cruise_controller_20.lus
index ca344ccb..c17e60fa 100644
--- a/lustrec_tests/lustre_files/cruise_controller_20.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_20.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_20(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_21.lus b/lustrec_tests/lustre_files/cruise_controller_21.lus
index e74f63b3..cca3ca42 100644
--- a/lustrec_tests/lustre_files/cruise_controller_21.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_21.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_21(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_22.lus b/lustrec_tests/lustre_files/cruise_controller_22.lus
index def613df..5100ac88 100644
--- a/lustrec_tests/lustre_files/cruise_controller_22.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_22.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_22(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_23.lus b/lustrec_tests/lustre_files/cruise_controller_23.lus
index 4b80e436..28f1af3c 100644
--- a/lustrec_tests/lustre_files/cruise_controller_23.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_23.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_23(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/cruise_controller_24.lus b/lustrec_tests/lustre_files/cruise_controller_24.lus
index bad1cadf..61fe48eb 100644
--- a/lustrec_tests/lustre_files/cruise_controller_24.lus
+++ b/lustrec_tests/lustre_files/cruise_controller_24.lus
@@ -1,6 +1,6 @@
 
 
-node top(onOff: bool; 
+node cruise_controller_24(onOff: bool; 
       decelSet: bool; 
       accelResume: bool; 
       cancel: bool; 
diff --git a/lustrec_tests/lustre_files/durationThm_1.lus b/lustrec_tests/lustre_files/durationThm_1.lus
index 1ee0bdc4..1c1a131b 100644
--- a/lustrec_tests/lustre_files/durationThm_1.lus
+++ b/lustrec_tests/lustre_files/durationThm_1.lus
@@ -18,7 +18,7 @@ tel
 -- (p -k-> q and q -m-> r) => p -k+m-> r
 
 -- Not provable in luke-*
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_1_e1_350.lus b/lustrec_tests/lustre_files/durationThm_1_e1_350.lus
index 48a2f9d9..34693875 100644
--- a/lustrec_tests/lustre_files/durationThm_1_e1_350.lus
+++ b/lustrec_tests/lustre_files/durationThm_1_e1_350.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) +1+ 1 else 0;
 tel
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1_e1_350 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_1_e2_3.lus b/lustrec_tests/lustre_files/durationThm_1_e2_3.lus
index 45bae14c..7263c80f 100644
--- a/lustrec_tests/lustre_files/durationThm_1_e2_3.lus
+++ b/lustrec_tests/lustre_files/durationThm_1_e2_3.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) -1+ 1 else 0;
 tel
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1_e2_3 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK by 3-induction;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_1_e3_389.lus b/lustrec_tests/lustre_files/durationThm_1_e3_389.lus
index 853e9487..f194e160 100644
--- a/lustrec_tests/lustre_files/durationThm_1_e3_389.lus
+++ b/lustrec_tests/lustre_files/durationThm_1_e3_389.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) - 1 else 0;
 tel
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1_e3_389 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_1_e3_389_e4_294.lus b/lustrec_tests/lustre_files/durationThm_1_e3_389_e4_294.lus
index d0e84ee4..551a1ed8 100644
--- a/lustrec_tests/lustre_files/durationThm_1_e3_389_e4_294.lus
+++ b/lustrec_tests/lustre_files/durationThm_1_e3_389_e4_294.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) +1- 1 else 0;
 tel
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1_e3_389_e4_294 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK by 3-induction;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_1_e3_389_e5_5.lus b/lustrec_tests/lustre_files/durationThm_1_e3_389_e5_5.lus
index 014f58b1..a8116d4b 100644
--- a/lustrec_tests/lustre_files/durationThm_1_e3_389_e5_5.lus
+++ b/lustrec_tests/lustre_files/durationThm_1_e3_389_e5_5.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) -1- 1 else 0;
 tel
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1_e3_389_e5_5 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_1_e7_217.lus b/lustrec_tests/lustre_files/durationThm_1_e7_217.lus
index 4a7da320..fb27c118 100644
--- a/lustrec_tests/lustre_files/durationThm_1_e7_217.lus
+++ b/lustrec_tests/lustre_files/durationThm_1_e7_217.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) + 1 else 0;
 tel
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1_e7_217 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_1_e7_217_e1_89.lus b/lustrec_tests/lustre_files/durationThm_1_e7_217_e1_89.lus
index 70d16fe4..46046ef9 100644
--- a/lustrec_tests/lustre_files/durationThm_1_e7_217_e1_89.lus
+++ b/lustrec_tests/lustre_files/durationThm_1_e7_217_e1_89.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) +1+ 1 else 0;
 tel
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1_e7_217_e1_89 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_1_e7_217_e2_352.lus b/lustrec_tests/lustre_files/durationThm_1_e7_217_e2_352.lus
index 3af57bdb..24b061f9 100644
--- a/lustrec_tests/lustre_files/durationThm_1_e7_217_e2_352.lus
+++ b/lustrec_tests/lustre_files/durationThm_1_e7_217_e2_352.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) -1+ 1 else 0;
 tel
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1_e7_217_e2_352 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK by 7-induction;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_1_e7_217_e3_132.lus b/lustrec_tests/lustre_files/durationThm_1_e7_217_e3_132.lus
index a49214ad..f69849ea 100644
--- a/lustrec_tests/lustre_files/durationThm_1_e7_217_e3_132.lus
+++ b/lustrec_tests/lustre_files/durationThm_1_e7_217_e3_132.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) - 1 else 0;
 tel
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1_e7_217_e3_132 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_1_e7_217_e7_31.lus b/lustrec_tests/lustre_files/durationThm_1_e7_217_e7_31.lus
index b8dc4acd..6a6978af 100644
--- a/lustrec_tests/lustre_files/durationThm_1_e7_217_e7_31.lus
+++ b/lustrec_tests/lustre_files/durationThm_1_e7_217_e7_31.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) + 1 else 0;
 tel
-node top (ik, im: int; p, q, r : bool) returns (OK: bool);
+node durationThm_1_e7_217_e7_31 (ik, im: int; p, q, r : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m : int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2.lus b/lustrec_tests/lustre_files/durationThm_2.lus
index 550a5b75..bb0dd8ac 100644
--- a/lustrec_tests/lustre_files/durationThm_2.lus
+++ b/lustrec_tests/lustre_files/durationThm_2.lus
@@ -18,7 +18,7 @@ tel
 -- (p -k-> q and r -k-> t) => (p and r) -k-> (q and t)
 
 -- Not provable in luke-*
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e1_301.lus b/lustrec_tests/lustre_files/durationThm_2_e1_301.lus
index c905d4a1..53d13e01 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e1_301.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e1_301.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) +1+ 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e1_301 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e2_63.lus b/lustrec_tests/lustre_files/durationThm_2_e2_63.lus
index 44d06ff2..77e9d287 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e2_63.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e2_63.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) -1+ 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e2_63 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK by 3-induction;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e3_329_e4_1.lus b/lustrec_tests/lustre_files/durationThm_2_e3_329_e4_1.lus
index bf9a367f..bf893541 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e3_329_e4_1.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e3_329_e4_1.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) +1- 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e3_329_e4_1 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK by 3-induction;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e3_329_e5_124.lus b/lustrec_tests/lustre_files/durationThm_2_e3_329_e5_124.lus
index 8dde8835..6f5657e9 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e3_329_e5_124.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e3_329_e5_124.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) -1- 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e3_329_e5_124 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e3_99.lus b/lustrec_tests/lustre_files/durationThm_2_e3_99.lus
index 841b5e76..5294c94e 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e3_99.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e3_99.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) - 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e3_99 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e7_145_e1_343.lus b/lustrec_tests/lustre_files/durationThm_2_e7_145_e1_343.lus
index 7a6d6c16..d9b84fd4 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e7_145_e1_343.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e7_145_e1_343.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) +1+ 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e7_145_e1_343 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e7_145_e2_169.lus b/lustrec_tests/lustre_files/durationThm_2_e7_145_e2_169.lus
index a5c0dd84..f65a3df4 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e7_145_e2_169.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e7_145_e2_169.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) -1+ 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e7_145_e2_169 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK by 8-induction;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e7_145_e3_222.lus b/lustrec_tests/lustre_files/durationThm_2_e7_145_e3_222.lus
index 5df42c67..57cd0808 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e7_145_e3_222.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e7_145_e3_222.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) - 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e7_145_e3_222 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e7_145_e7_154.lus b/lustrec_tests/lustre_files/durationThm_2_e7_145_e7_154.lus
index c6897959..6297d33d 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e7_145_e7_154.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e7_145_e7_154.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) + 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e7_145_e7_154 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e7_145_e8_73.lus b/lustrec_tests/lustre_files/durationThm_2_e7_145_e8_73.lus
index 3a5be658..e5ba28a0 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e7_145_e8_73.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e7_145_e8_73.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) + 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e7_145_e8_73 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_2_e7_149.lus b/lustrec_tests/lustre_files/durationThm_2_e7_149.lus
index bddc96f9..a83a7a5e 100644
--- a/lustrec_tests/lustre_files/durationThm_2_e7_149.lus
+++ b/lustrec_tests/lustre_files/durationThm_2_e7_149.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) + 1 else 0;
 tel
-node top (k0: int; p, q, r, t : bool) returns (OK: bool);
+node durationThm_2_e7_149 (k0: int; p, q, r, t : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3.lus b/lustrec_tests/lustre_files/durationThm_3.lus
index abbe7093..fca98aed 100644
--- a/lustrec_tests/lustre_files/durationThm_3.lus
+++ b/lustrec_tests/lustre_files/durationThm_3.lus
@@ -18,7 +18,7 @@ tel
 -- ((p -k-> q and ([[q]] => length <= m))  => ([[p]] => length <= k+m)
 
 -- Not provable in luke-*
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e1_36.lus b/lustrec_tests/lustre_files/durationThm_3_e1_36.lus
index 908fbc38..1eb465d1 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e1_36.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e1_36.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) +1+ 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e1_36 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e1_71.lus b/lustrec_tests/lustre_files/durationThm_3_e1_71.lus
index 908fbc38..d9b5e98c 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e1_71.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e1_71.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) +1+ 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e1_71 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e2_148.lus b/lustrec_tests/lustre_files/durationThm_3_e2_148.lus
index 6a28c7c6..1a161cb7 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e2_148.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e2_148.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) -1+ 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e2_148 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e2_63.lus b/lustrec_tests/lustre_files/durationThm_3_e2_63.lus
index 6a28c7c6..e50f2f1e 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e2_63.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e2_63.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) -1+ 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e2_63 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e3_207.lus b/lustrec_tests/lustre_files/durationThm_3_e3_207.lus
index 0e4f6c2d..1a4ecb6e 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e3_207.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e3_207.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) - 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e3_207 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e3_442.lus b/lustrec_tests/lustre_files/durationThm_3_e3_442.lus
index 0e4f6c2d..2b9c58fe 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e3_442.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e3_442.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) - 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e3_442 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e3_442_e4_165.lus b/lustrec_tests/lustre_files/durationThm_3_e3_442_e4_165.lus
index a416e58f..256c819d 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e3_442_e4_165.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e3_442_e4_165.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) +1- 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e3_442_e4_165 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e3_442_e5_260.lus b/lustrec_tests/lustre_files/durationThm_3_e3_442_e5_260.lus
index 6ef577a6..bebf6606 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e3_442_e5_260.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e3_442_e5_260.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) -1- 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e3_442_e5_260 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e7_334.lus b/lustrec_tests/lustre_files/durationThm_3_e7_334.lus
index 475b6d14..6ce9eff7 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e7_334.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e7_334.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) + 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e7_334 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e7_334_e1_431.lus b/lustrec_tests/lustre_files/durationThm_3_e7_334_e1_431.lus
index d00a1741..bc55120f 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e7_334_e1_431.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e7_334_e1_431.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) +1+ 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e7_334_e1_431 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e7_334_e2_62.lus b/lustrec_tests/lustre_files/durationThm_3_e7_334_e2_62.lus
index 5bf36dd2..7651cf3d 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e7_334_e2_62.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e7_334_e2_62.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) -1+ 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e7_334_e2_62 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK by 4-induction;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e7_334_e3_42.lus b/lustrec_tests/lustre_files/durationThm_3_e7_334_e3_42.lus
index e7cfd502..49ad36ed 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e7_334_e3_42.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e7_334_e3_42.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) - 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e7_334_e3_42 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/durationThm_3_e7_334_e7_118.lus b/lustrec_tests/lustre_files/durationThm_3_e7_334_e7_118.lus
index 533a9170..c2dadf2f 100644
--- a/lustrec_tests/lustre_files/durationThm_3_e7_334_e7_118.lus
+++ b/lustrec_tests/lustre_files/durationThm_3_e7_334_e7_118.lus
@@ -7,7 +7,7 @@ node Age (p: bool) returns (age_of_p: int);
 let
  age_of_p = 0 -> if pre(p) then pre(age_of_p) + 1 else 0;
 tel
-node top (k0, m0: int; p, q : bool) returns (OK: bool);
+node durationThm_3_e7_334_e7_118 (k0, m0: int; p, q : bool) returns (OK: bool);
 --@ contract guarantee OK;
 var k,m: int;
     env : bool;
diff --git a/lustrec_tests/lustre_files/ex1.lus b/lustrec_tests/lustre_files/ex1.lus
index 07858af1..9c21c15d 100644
--- a/lustrec_tests/lustre_files/ex1.lus
+++ b/lustrec_tests/lustre_files/ex1.lus
@@ -1,4 +1,4 @@
-node top(in0 : real) returns (x, y : real);
+node ex1(in0 : real) returns (x, y : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x = 0. -> 1.5 * pre x - 0.7 * pre y + 1.6 * in0;
diff --git a/lustrec_tests/lustre_files/ex1reset.lus b/lustrec_tests/lustre_files/ex1reset.lus
index 53d794d9..73fdaa6b 100644
--- a/lustrec_tests/lustre_files/ex1reset.lus
+++ b/lustrec_tests/lustre_files/ex1reset.lus
@@ -1,4 +1,4 @@
-node top(r : bool; in0 : real) returns (x, y : real);
+node ex1reset(r : bool; in0 : real) returns (x, y : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x = 0. -> if r then 1. else 1.5 * pre x - 0.7 * pre y + 1.6 * in0;
diff --git a/lustrec_tests/lustre_files/ex1sat.lus b/lustrec_tests/lustre_files/ex1sat.lus
index e78952f7..a08a6b65 100644
--- a/lustrec_tests/lustre_files/ex1sat.lus
+++ b/lustrec_tests/lustre_files/ex1sat.lus
@@ -1,4 +1,4 @@
-node top(in0 : real) returns (sx, x, y : real);
+node ex1sat(in0 : real) returns (sx, x, y : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x = 0. -> 1.5 * pre sx - 0.7 * pre y + 1.6 * in0;
diff --git a/lustrec_tests/lustre_files/ex2.lus b/lustrec_tests/lustre_files/ex2.lus
index ed0c49d6..15398dc1 100644
--- a/lustrec_tests/lustre_files/ex2.lus
+++ b/lustrec_tests/lustre_files/ex2.lus
@@ -1,4 +1,4 @@
-node top(in0 : real) returns (x0, x1, x2, x3 : real);
+node ex2(in0 : real) returns (x0, x1, x2, x3 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> 1.5 * pre x0 - 0.7 * pre x1 - 0.7 * pre x2 + 0.4 * pre x3 + 0.5 * in0;
diff --git a/lustrec_tests/lustre_files/ex2reset.lus b/lustrec_tests/lustre_files/ex2reset.lus
index a4353169..34e99d8b 100644
--- a/lustrec_tests/lustre_files/ex2reset.lus
+++ b/lustrec_tests/lustre_files/ex2reset.lus
@@ -1,4 +1,4 @@
-node top(r : bool; in0 : real) returns (x0, x1, x2, x3 : real);
+node ex2reset(r : bool; in0 : real) returns (x0, x1, x2, x3 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> if r then 1. else 1.5 * pre x0 - 0.7 * pre x1 - 0.7 * pre x2 + 0.4 * pre x3 + 0.5 * in0;
diff --git a/lustrec_tests/lustre_files/ex2sat.lus b/lustrec_tests/lustre_files/ex2sat.lus
index d1bbe5a6..665ce0e9 100644
--- a/lustrec_tests/lustre_files/ex2sat.lus
+++ b/lustrec_tests/lustre_files/ex2sat.lus
@@ -1,4 +1,4 @@
-node top(in0 : real) returns (sx0, x0, x1, x2, x3 : real);
+node ex2sat(in0 : real) returns (sx0, x0, x1, x2, x3 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> 1.5 * pre sx0 - 0.7 * pre x1 - 0.7 * pre x2 + 0.4 * pre x3 + 0.5 * in0;
diff --git a/lustrec_tests/lustre_files/ex3.lus b/lustrec_tests/lustre_files/ex3.lus
index 43f5c6f8..07f83b04 100644
--- a/lustrec_tests/lustre_files/ex3.lus
+++ b/lustrec_tests/lustre_files/ex3.lus
@@ -1,4 +1,4 @@
-node top(in0 : real) returns (x0, x1 : real);
+node ex3(in0 : real) returns (x0, x1 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> 0.499 * pre x0 - 0.05 * pre x1 + in0;
diff --git a/lustrec_tests/lustre_files/ex3_e7_590_e7_590.lus b/lustrec_tests/lustre_files/ex3_e7_590_e7_590.lus
index 0c8868d4..51d52b68 100644
--- a/lustrec_tests/lustre_files/ex3_e7_590_e7_590.lus
+++ b/lustrec_tests/lustre_files/ex3_e7_590_e7_590.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex3_e7_590_e7_590(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex3_e7_655.lus b/lustrec_tests/lustre_files/ex3_e7_655.lus
index e7e1dffb..4b248f36 100644
--- a/lustrec_tests/lustre_files/ex3_e7_655.lus
+++ b/lustrec_tests/lustre_files/ex3_e7_655.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex3_e7_655(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex3_e8_381.lus b/lustrec_tests/lustre_files/ex3_e8_381.lus
index 693fc6ae..9571e93c 100644
--- a/lustrec_tests/lustre_files/ex3_e8_381.lus
+++ b/lustrec_tests/lustre_files/ex3_e8_381.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex3_e8_381(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex3_e8_381_e7_224.lus b/lustrec_tests/lustre_files/ex3_e8_381_e7_224.lus
index ed76cdb1..422d605b 100644
--- a/lustrec_tests/lustre_files/ex3_e8_381_e7_224.lus
+++ b/lustrec_tests/lustre_files/ex3_e8_381_e7_224.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex3_e8_381_e7_224(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex3_e8_381_e8_477.lus b/lustrec_tests/lustre_files/ex3_e8_381_e8_477.lus
index db939b2f..ef879ddb 100644
--- a/lustrec_tests/lustre_files/ex3_e8_381_e8_477.lus
+++ b/lustrec_tests/lustre_files/ex3_e8_381_e8_477.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex3_e8_381_e8_477(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex3reset.lus b/lustrec_tests/lustre_files/ex3reset.lus
index 9866955c..d4205cb6 100644
--- a/lustrec_tests/lustre_files/ex3reset.lus
+++ b/lustrec_tests/lustre_files/ex3reset.lus
@@ -1,4 +1,4 @@
-node top(r : bool; in0 : real) returns (x0, x1 : real);
+node ex3reset(r : bool; in0 : real) returns (x0, x1 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> if r then 1. else 0.499 * pre x0 - 0.05 * pre x1 + in0;
diff --git a/lustrec_tests/lustre_files/ex3sat.lus b/lustrec_tests/lustre_files/ex3sat.lus
index f7ff3fe9..6cfe2eb7 100644
--- a/lustrec_tests/lustre_files/ex3sat.lus
+++ b/lustrec_tests/lustre_files/ex3sat.lus
@@ -1,4 +1,4 @@
-node top(in0 : real) returns (sx0, x0, x1 : real);
+node ex3sat(in0 : real) returns (sx0, x0, x1 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> 0.499 * pre sx0 - 0.05 * pre x1 + in0;
diff --git a/lustrec_tests/lustre_files/ex4.lus b/lustrec_tests/lustre_files/ex4.lus
index 4dd2a744..4aac4706 100644
--- a/lustrec_tests/lustre_files/ex4.lus
+++ b/lustrec_tests/lustre_files/ex4.lus
@@ -1,4 +1,4 @@
-node top(in0 : real) returns (x0, x1, x2 : real);
+node ex4(in0 : real) returns (x0, x1, x2 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> 0.9379 * pre x0 - 0.0381 * pre x1 - 0.0414 * pre x2 + 0.0237 * in0;
diff --git a/lustrec_tests/lustre_files/ex4reset.lus b/lustrec_tests/lustre_files/ex4reset.lus
index aa2071db..f4c09798 100644
--- a/lustrec_tests/lustre_files/ex4reset.lus
+++ b/lustrec_tests/lustre_files/ex4reset.lus
@@ -1,4 +1,4 @@
-node top(r : bool; in0 : real) returns (x0, x1, x2 : real);
+node ex4reset(r : bool; in0 : real) returns (x0, x1, x2 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> if r then 1. else 0.9379 * pre x0 - 0.0381 * pre x1 - 0.0414 * pre x2 + 0.0237 * in0;
diff --git a/lustrec_tests/lustre_files/ex4sat.lus b/lustrec_tests/lustre_files/ex4sat.lus
index af545eec..4bfe130f 100644
--- a/lustrec_tests/lustre_files/ex4sat.lus
+++ b/lustrec_tests/lustre_files/ex4sat.lus
@@ -1,4 +1,4 @@
-node top(in0 : real) returns (sx0, x0, x1, x2 : real);
+node ex4sat(in0 : real) returns (sx0, x0, x1, x2 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> 0.9379 * pre sx0 - 0.0381 * pre x1 - 0.0414 * pre x2 + 0.0237 * in0;
diff --git a/lustrec_tests/lustre_files/ex5.lus b/lustrec_tests/lustre_files/ex5.lus
index 35cc6253..f6102f22 100644
--- a/lustrec_tests/lustre_files/ex5.lus
+++ b/lustrec_tests/lustre_files/ex5.lus
@@ -1,4 +1,4 @@
-node top(in0, in1 : real) returns (x0, x1, x2, x3 : real);
+node ex5(in0, in1 : real) returns (x0, x1, x2, x3 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   assert(in1 >= -1. and in1 <= 1.);
diff --git a/lustrec_tests/lustre_files/ex5reset.lus b/lustrec_tests/lustre_files/ex5reset.lus
index e8d29b52..cb21d97d 100644
--- a/lustrec_tests/lustre_files/ex5reset.lus
+++ b/lustrec_tests/lustre_files/ex5reset.lus
@@ -1,4 +1,4 @@
-node top(r : bool; in0, in1 : real) returns (x0, x1, x2, x3 : real);
+node ex5reset(r : bool; in0, in1 : real) returns (x0, x1, x2, x3 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   assert(in1 >= -1. and in1 <= 1.);
diff --git a/lustrec_tests/lustre_files/ex5sat.lus b/lustrec_tests/lustre_files/ex5sat.lus
index 89ba6b2f..6c7221a0 100644
--- a/lustrec_tests/lustre_files/ex5sat.lus
+++ b/lustrec_tests/lustre_files/ex5sat.lus
@@ -1,4 +1,4 @@
-node top(in0, in1 : real) returns (sx0, x0, x1, x2, x3 : real);
+node ex5sat(in0, in1 : real) returns (sx0, x0, x1, x2, x3 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   assert(in1 >= -1. and in1 <= 1.);
diff --git a/lustrec_tests/lustre_files/ex6.lus b/lustrec_tests/lustre_files/ex6.lus
index 4a1537fe..27b257fd 100644
--- a/lustrec_tests/lustre_files/ex6.lus
+++ b/lustrec_tests/lustre_files/ex6.lus
@@ -1,4 +1,4 @@
-node top(in0 : real) returns (x0, x1, x2, x3, x4 : real);
+node ex6(in0 : real) returns (x0, x1, x2, x3, x4 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> 0.4250 * pre x0 + 0.8131 * in0;
diff --git a/lustrec_tests/lustre_files/ex6reset.lus b/lustrec_tests/lustre_files/ex6reset.lus
index 2cc78311..f3aafc27 100644
--- a/lustrec_tests/lustre_files/ex6reset.lus
+++ b/lustrec_tests/lustre_files/ex6reset.lus
@@ -1,4 +1,4 @@
-node top(r : bool; in0 : real) returns (x0, x1, x2, x3, x4 : real);
+node ex6reset(r : bool; in0 : real) returns (x0, x1, x2, x3, x4 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> if r then 1. else 0.4250 * pre x0 + 0.8131 * in0;
diff --git a/lustrec_tests/lustre_files/ex6sat.lus b/lustrec_tests/lustre_files/ex6sat.lus
index 53aa6d11..35d181ba 100644
--- a/lustrec_tests/lustre_files/ex6sat.lus
+++ b/lustrec_tests/lustre_files/ex6sat.lus
@@ -1,4 +1,4 @@
-node top(in0 : real) returns (sx0, x0, x1, x2, x3, x4 : real);
+node ex6sat(in0 : real) returns (sx0, x0, x1, x2, x3, x4 : real);
 let
   assert(in0 >= -1. and in0 <= 1.);
   x0 = 0. -> 0.4250 * pre sx0 + 0.8131 * in0;
diff --git a/lustrec_tests/lustre_files/ex7.lus b/lustrec_tests/lustre_files/ex7.lus
index 8fc29f8a..a9dd37db 100644
--- a/lustrec_tests/lustre_files/ex7.lus
+++ b/lustrec_tests/lustre_files/ex7.lus
@@ -1,4 +1,4 @@
-node top(ix0, ix1 : real) returns (x0, x1 : real);
+node ex7(ix0, ix1 : real) returns (x0, x1 : real);
 let
   assert(ix0 > 0. and ix0 < 1.);
   assert(ix1 > 0. and ix1 < 1.);
diff --git a/lustrec_tests/lustre_files/ex7reset.lus b/lustrec_tests/lustre_files/ex7reset.lus
index fb1e5868..350bb63b 100644
--- a/lustrec_tests/lustre_files/ex7reset.lus
+++ b/lustrec_tests/lustre_files/ex7reset.lus
@@ -1,4 +1,4 @@
-node top(r : bool; ix0, ix1 : real) returns (x0, x1 : real);
+node ex7reset(r : bool; ix0, ix1 : real) returns (x0, x1 : real);
 let
   assert(ix0 > 0. and ix0 < 1.);
   assert(ix1 > 0. and ix1 < 1.);
diff --git a/lustrec_tests/lustre_files/ex7sat.lus b/lustrec_tests/lustre_files/ex7sat.lus
index 29f3e724..0e46caaf 100644
--- a/lustrec_tests/lustre_files/ex7sat.lus
+++ b/lustrec_tests/lustre_files/ex7sat.lus
@@ -1,4 +1,4 @@
-node top(ix0, ix1 : real) returns (sx0, x0, x1 : real);
+node ex7sat(ix0, ix1 : real) returns (sx0, x0, x1 : real);
 let
   assert(ix0 > 0. and ix0 < 1.);
   assert(ix1 > 0. and ix1 < 1.);
diff --git a/lustrec_tests/lustre_files/ex8.lus b/lustrec_tests/lustre_files/ex8.lus
index e829017b..d0b70e81 100644
--- a/lustrec_tests/lustre_files/ex8.lus
+++ b/lustrec_tests/lustre_files/ex8.lus
@@ -1,4 +1,4 @@
-node top(ix0, ix1 : real) returns (x0, x1 : real);
+node ex8(ix0, ix1 : real) returns (x0, x1 : real);
 let
   assert(ix0 > 0. and ix0 < 1.);
   assert(ix1 > 0. and ix1 < 1.);
diff --git a/lustrec_tests/lustre_files/ex8_e7_74.lus b/lustrec_tests/lustre_files/ex8_e7_74.lus
index 758c34ef..8b817dd3 100644
--- a/lustrec_tests/lustre_files/ex8_e7_74.lus
+++ b/lustrec_tests/lustre_files/ex8_e7_74.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex8_e7_74(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex8_e7_74_e7_740.lus b/lustrec_tests/lustre_files/ex8_e7_74_e7_740.lus
index fe84ef34..eee78caa 100644
--- a/lustrec_tests/lustre_files/ex8_e7_74_e7_740.lus
+++ b/lustrec_tests/lustre_files/ex8_e7_74_e7_740.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex8_e7_74_e7_740(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex8_e7_74_e8_302.lus b/lustrec_tests/lustre_files/ex8_e7_74_e8_302.lus
index 410b2222..768c2a77 100644
--- a/lustrec_tests/lustre_files/ex8_e7_74_e8_302.lus
+++ b/lustrec_tests/lustre_files/ex8_e7_74_e8_302.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex8_e7_74_e8_302(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex8_e8_220.lus b/lustrec_tests/lustre_files/ex8_e8_220.lus
index 9921b149..33735aca 100644
--- a/lustrec_tests/lustre_files/ex8_e8_220.lus
+++ b/lustrec_tests/lustre_files/ex8_e8_220.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex8_e8_220(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex8_e8_220_e7_249.lus b/lustrec_tests/lustre_files/ex8_e8_220_e7_249.lus
index ff437100..a20fd691 100644
--- a/lustrec_tests/lustre_files/ex8_e8_220_e7_249.lus
+++ b/lustrec_tests/lustre_files/ex8_e8_220_e7_249.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex8_e8_220_e7_249(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex8_e8_376.lus b/lustrec_tests/lustre_files/ex8_e8_376.lus
index 9921b149..b4f8d1fe 100644
--- a/lustrec_tests/lustre_files/ex8_e8_376.lus
+++ b/lustrec_tests/lustre_files/ex8_e8_376.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node ex8_e8_376(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/ex8reset.lus b/lustrec_tests/lustre_files/ex8reset.lus
index 3376b464..7e6d3608 100644
--- a/lustrec_tests/lustre_files/ex8reset.lus
+++ b/lustrec_tests/lustre_files/ex8reset.lus
@@ -1,4 +1,4 @@
-node top(r : bool; ix0, ix1 : real) returns (x0, x1 : real);
+node ex8reset(r : bool; ix0, ix1 : real) returns (x0, x1 : real);
 let
   assert(ix0 > 0. and ix0 < 1.);
   assert(ix1 > 0. and ix1 < 1.);
diff --git a/lustrec_tests/lustre_files/ex8sat.lus b/lustrec_tests/lustre_files/ex8sat.lus
index 3c504d27..3dad9710 100644
--- a/lustrec_tests/lustre_files/ex8sat.lus
+++ b/lustrec_tests/lustre_files/ex8sat.lus
@@ -1,4 +1,4 @@
-node top(ix0, ix1 : real) returns (sx0, x0, x1 : real);
+node ex8sat(ix0, ix1 : real) returns (sx0, x0, x1 : real);
 let
   assert(ix0 > 0. and ix0 < 1.);
   assert(ix1 > 0. and ix1 < 1.);
diff --git a/lustrec_tests/lustre_files/fast_1.lus b/lustrec_tests/lustre_files/fast_1.lus
index adf76040..c797394e 100644
--- a/lustrec_tests/lustre_files/fast_1.lus
+++ b/lustrec_tests/lustre_files/fast_1.lus
@@ -124,7 +124,7 @@ let
            else pre(cca);
 tel
 
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_1 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/fast_1_e7_2044.lus b/lustrec_tests/lustre_files/fast_1_e7_2044.lus
index 5d86c474..3fbbbb29 100644
--- a/lustrec_tests/lustre_files/fast_1_e7_2044.lus
+++ b/lustrec_tests/lustre_files/fast_1_e7_2044.lus
@@ -69,7 +69,7 @@ let
            and ccall then true else if not ccall then false
            else pre(cca);
 tel
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_1_e7_2044 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK : bool);
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/fast_1_e7_2044_e7_1287.lus b/lustrec_tests/lustre_files/fast_1_e7_2044_e7_1287.lus
index d1b088c1..ea0237c4 100644
--- a/lustrec_tests/lustre_files/fast_1_e7_2044_e7_1287.lus
+++ b/lustrec_tests/lustre_files/fast_1_e7_2044_e7_1287.lus
@@ -69,7 +69,7 @@ let
            and ccall then true else if not ccall then false
            else pre(cca);
 tel
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_1_e7_2044_e7_1287 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK : bool);
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/fast_1_e8_747_e7_692.lus b/lustrec_tests/lustre_files/fast_1_e8_747_e7_692.lus
index 1e4860a4..55b870b4 100644
--- a/lustrec_tests/lustre_files/fast_1_e8_747_e7_692.lus
+++ b/lustrec_tests/lustre_files/fast_1_e8_747_e7_692.lus
@@ -69,7 +69,7 @@ let
            and ccall then true else if not ccall then false
            else pre(cca);
 tel
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_1_e8_747_e7_692 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK : bool);
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/fast_1_e8_747_e8_1041.lus b/lustrec_tests/lustre_files/fast_1_e8_747_e8_1041.lus
index c3078830..e4d25a24 100644
--- a/lustrec_tests/lustre_files/fast_1_e8_747_e8_1041.lus
+++ b/lustrec_tests/lustre_files/fast_1_e8_747_e8_1041.lus
@@ -69,7 +69,7 @@ let
            and ccall then true else if not ccall then false
            else pre(cca);
 tel
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_1_e8_747_e8_1041 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/fast_1_e8_751.lus b/lustrec_tests/lustre_files/fast_1_e8_751.lus
index 36ed799d..8a85edb4 100644
--- a/lustrec_tests/lustre_files/fast_1_e8_751.lus
+++ b/lustrec_tests/lustre_files/fast_1_e8_751.lus
@@ -69,7 +69,7 @@ let
            and ccall then true else if not ccall then false
            else pre(cca);
 tel
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_1_e8_751 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK : bool);
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/fast_2.lus b/lustrec_tests/lustre_files/fast_2.lus
index e13821c1..c70056f0 100644
--- a/lustrec_tests/lustre_files/fast_2.lus
+++ b/lustrec_tests/lustre_files/fast_2.lus
@@ -125,7 +125,7 @@ let
 tel
 
 -- Verify node is used to verify properties p1..pn
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_2 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/fast_2_e7_2526.lus b/lustrec_tests/lustre_files/fast_2_e7_2526.lus
index ac78a5b5..3bce59db 100644
--- a/lustrec_tests/lustre_files/fast_2_e7_2526.lus
+++ b/lustrec_tests/lustre_files/fast_2_e7_2526.lus
@@ -69,7 +69,7 @@ let
            and ccall then true else if not ccall then false
            else pre(cca);
 tel
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_2_e7_2526 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK: bool);
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/fast_2_e7_2526_e7_2736.lus b/lustrec_tests/lustre_files/fast_2_e7_2526_e7_2736.lus
index 1410eb54..5a71a600 100644
--- a/lustrec_tests/lustre_files/fast_2_e7_2526_e7_2736.lus
+++ b/lustrec_tests/lustre_files/fast_2_e7_2526_e7_2736.lus
@@ -69,7 +69,7 @@ let
            and ccall then true else if not ccall then false
            else pre(cca);
 tel
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_2_e7_2526_e7_2736 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK: bool);
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/fast_2_e8_460_e7_43.lus b/lustrec_tests/lustre_files/fast_2_e8_460_e7_43.lus
index 3b00f03b..80be554e 100644
--- a/lustrec_tests/lustre_files/fast_2_e8_460_e7_43.lus
+++ b/lustrec_tests/lustre_files/fast_2_e8_460_e7_43.lus
@@ -69,7 +69,7 @@ let
            and ccall then true else if not ccall then false
            else pre(cca);
 tel
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_2_e8_460_e7_43 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK: bool);
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/fast_2_e8_460_e8_1920.lus b/lustrec_tests/lustre_files/fast_2_e8_460_e8_1920.lus
index 3cee21b4..82938e25 100644
--- a/lustrec_tests/lustre_files/fast_2_e8_460_e8_1920.lus
+++ b/lustrec_tests/lustre_files/fast_2_e8_460_e8_1920.lus
@@ -69,7 +69,7 @@ let
            and ccall then true else if not ccall then false
            else pre(cca);
 tel
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_2_e8_460_e8_1920 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/fast_2_e8_976.lus b/lustrec_tests/lustre_files/fast_2_e8_976.lus
index 4a82683a..138dba0e 100644
--- a/lustrec_tests/lustre_files/fast_2_e8_976.lus
+++ b/lustrec_tests/lustre_files/fast_2_e8_976.lus
@@ -69,7 +69,7 @@ let
            and ccall then true else if not ccall then false
            else pre(cca);
 tel
-node top (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
+node fast_2_e8_976 (igsw, ccd, cconoff, bpa, cccanc, battok, gearok,
          qfok, sdok, accok, ccseti, ccsetd, ccr: bool; vs: int)
          returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/heater4.lus b/lustrec_tests/lustre_files/heater4.lus
index 5e75eacc..040f202b 100644
--- a/lustrec_tests/lustre_files/heater4.lus
+++ b/lustrec_tests/lustre_files/heater4.lus
@@ -1,4 +1,4 @@
-node top(millisecond : bool) returns (open_light : bool)
+node heater4(millisecond : bool) returns (open_light : bool)
 (*@ contract guarantee open_light by 2-induction; *)
 let
   automaton command_control
diff --git a/lustrec_tests/lustre_files/hysteresis_2.lus b/lustrec_tests/lustre_files/hysteresis_2.lus
index c3c93cde..385b5fb2 100644
--- a/lustrec_tests/lustre_files/hysteresis_2.lus
+++ b/lustrec_tests/lustre_files/hysteresis_2.lus
@@ -26,7 +26,7 @@ let
                     else diff <= -10;
 tel
 
-node top( beacon, second : bool ) returns ( OK : bool );
+node hysteresis_2( beacon, second : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var late, early : bool;
 let
diff --git a/lustrec_tests/lustre_files/hysteresis_3.lus b/lustrec_tests/lustre_files/hysteresis_3.lus
index 8c98a641..47cd72b9 100644
--- a/lustrec_tests/lustre_files/hysteresis_3.lus
+++ b/lustrec_tests/lustre_files/hysteresis_3.lus
@@ -26,7 +26,7 @@ let
                     else diff <= -10;
 tel
 
-node top( beacon, second : bool ) returns ( OK : bool );
+node hysteresis_3( beacon, second : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var late, early : bool;
 let
diff --git a/lustrec_tests/lustre_files/hysteresis_all.lus b/lustrec_tests/lustre_files/hysteresis_all.lus
index 83b0f86e..d674bf85 100644
--- a/lustrec_tests/lustre_files/hysteresis_all.lus
+++ b/lustrec_tests/lustre_files/hysteresis_all.lus
@@ -26,7 +26,7 @@ let
                     else diff <= -10;
 tel
 
-node top( beacon, second : bool ) returns ( OK : bool );
+node hysteresis_all( beacon, second : bool ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var late, early : bool;
 let
diff --git a/lustrec_tests/lustre_files/lp_iir_9600_2.lus b/lustrec_tests/lustre_files/lp_iir_9600_2.lus
index 57a5fc50..be5a4cc0 100644
--- a/lustrec_tests/lustre_files/lp_iir_9600_2.lus
+++ b/lustrec_tests/lustre_files/lp_iir_9600_2.lus
@@ -1,4 +1,4 @@
-node top(xn : real) returns (yn, xnm1, xnm2, ynm1 : real);
+node lp_iir_9600_2(xn : real) returns (yn, xnm1, xnm2, ynm1 : real);
 let
   assert(xn >= -1.6 and xn <= 1.6);
   yn = 0. -> 0.21875*xn + 0.40625*pre xnm1 + 0.21875*pre xnm2 + 0.375*pre yn - 0.1875*pre ynm1;
diff --git a/lustrec_tests/lustre_files/lp_iir_9600_4.lus b/lustrec_tests/lustre_files/lp_iir_9600_4.lus
index b5fc97b1..a5255741 100644
--- a/lustrec_tests/lustre_files/lp_iir_9600_4.lus
+++ b/lustrec_tests/lustre_files/lp_iir_9600_4.lus
@@ -1,4 +1,4 @@
-node top(xn : real) returns (yn, ynm1, ynm2, ynm3, xnm1, xnm2, xnm3, xnm4 : real);
+node lp_iir_9600_4(xn : real) returns (yn, ynm1, ynm2, ynm3, xnm1, xnm2, xnm3, xnm4 : real);
 let
   assert(xn >= -1.0 and xn <= 1.0);
   yn = 0. -> 0.046582906636443676*xn + 0.1863316265457747*pre xnm1 + 0.27949743981866204*pre xnm2 + 0.1863316265457747*pre xnm3 + 0.046582906636443676*pre xnm4 + 0.7820951980233379*pre yn - 0.6799785269162999*pre ynm1 + 0.1826756977530325*pre ynm2 - 0.03011887504316928*pre ynm3;
diff --git a/lustrec_tests/lustre_files/lp_iir_9600_4_elliptic.lus b/lustrec_tests/lustre_files/lp_iir_9600_4_elliptic.lus
index 5d00a879..e2a8b5a0 100644
--- a/lustrec_tests/lustre_files/lp_iir_9600_4_elliptic.lus
+++ b/lustrec_tests/lustre_files/lp_iir_9600_4_elliptic.lus
@@ -1,4 +1,4 @@
-node top(xn : real) returns (yn, ynm1, ynm2, ynm3, xnm1, xnm2, xnm3, xnm4 : real);
+node lp_iir_9600_4_elliptic(xn : real) returns (yn, ynm1, ynm2, ynm3, xnm1, xnm2, xnm3, xnm4 : real);
 let
   assert(xn >= -1.0 and xn <= 1.0);
   yn = 0. -> 0.027571327441965943*xn + 0.09946114577079751*pre xnm1 + 0.14434540411316932*pre xnm2 + 0.09946114577079751*pre xnm3 + 0.027571327441965943*pre xnm4 + 1.5881829830740517*pre yn - 1.7443826804178832*pre ynm1 + 1.0171424112847436*pre ynm2 - 0.3079664796302433*pre ynm3;
diff --git a/lustrec_tests/lustre_files/lp_iir_9600_6_elliptic.lus b/lustrec_tests/lustre_files/lp_iir_9600_6_elliptic.lus
index f1b411be..cfe9af68 100644
--- a/lustrec_tests/lustre_files/lp_iir_9600_6_elliptic.lus
+++ b/lustrec_tests/lustre_files/lp_iir_9600_6_elliptic.lus
@@ -1,4 +1,4 @@
-node top(xn : real) returns (yn, ynm1, ynm2, ynm3, ynm4, ynm5, xnm1, xnm2, xnm3, xnm4, xnm5, xnm6 : real);
+node lp_iir_9600_6_elliptic(xn : real) returns (yn, ynm1, ynm2, ynm3, ynm4, ynm5, xnm1, xnm2, xnm3, xnm4, xnm5, xnm6 : real);
 let
   assert(xn >= -1.0 and xn <= 1.0);
   yn = 0. -> 0.0071206017131343335*xn + 0.02429729818092203*pre xnm1 + 0.04613413371939573*pre xnm2 + 0.05613064430953349*pre xnm3 + 0.04613413371939573*pre xnm4 + 0.02429729818092203*pre xnm5 + 0.0071206017131343335*pre xnm6 - -2.7445577051566046*pre yn - 4.495158480897364*pre ynm1 - -4.649204375147074*pre ynm2 - 3.2299784258838873*pre ynm3 - -1.4088842648092799*pre ynm4 - 0.31451868286474205*pre ynm5;
diff --git a/lustrec_tests/lustre_files/metros_1.lus b/lustrec_tests/lustre_files/metros_1.lus
index 41f972be..c7275a03 100644
--- a/lustrec_tests/lustre_files/metros_1.lus
+++ b/lustrec_tests/lustre_files/metros_1.lus
@@ -44,7 +44,7 @@ let
   ast = H0 and H1;
 tel
 
-node top(B0, B1 : bool; S : bool) 
+node metros_1(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e1_846_e1_1317.lus b/lustrec_tests/lustre_files/metros_1_e1_846_e1_1317.lus
index c6a13c06..3bcb18de 100644
--- a/lustrec_tests/lustre_files/metros_1_e1_846_e1_1317.lus
+++ b/lustrec_tests/lustre_files/metros_1_e1_846_e1_1317.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e1_846_e1_1317(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e1_846_e2_1394.lus b/lustrec_tests/lustre_files/metros_1_e1_846_e2_1394.lus
index 66c7b8a4..a68c812b 100644
--- a/lustrec_tests/lustre_files/metros_1_e1_846_e2_1394.lus
+++ b/lustrec_tests/lustre_files/metros_1_e1_846_e2_1394.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e1_846_e2_1394(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e1_846_e3_1060.lus b/lustrec_tests/lustre_files/metros_1_e1_846_e3_1060.lus
index 8d571bbc..7aaf7944 100644
--- a/lustrec_tests/lustre_files/metros_1_e1_846_e3_1060.lus
+++ b/lustrec_tests/lustre_files/metros_1_e1_846_e3_1060.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e1_846_e3_1060(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e1_846_e7_397.lus b/lustrec_tests/lustre_files/metros_1_e1_846_e7_397.lus
index edfda059..84622b59 100644
--- a/lustrec_tests/lustre_files/metros_1_e1_846_e7_397.lus
+++ b/lustrec_tests/lustre_files/metros_1_e1_846_e7_397.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e1_846_e7_397(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e2_1102_e1_317.lus b/lustrec_tests/lustre_files/metros_1_e2_1102_e1_317.lus
index ea437fea..e3a6774c 100644
--- a/lustrec_tests/lustre_files/metros_1_e2_1102_e1_317.lus
+++ b/lustrec_tests/lustre_files/metros_1_e2_1102_e1_317.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e2_1102_e1_317(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e2_1102_e2_943.lus b/lustrec_tests/lustre_files/metros_1_e2_1102_e2_943.lus
index 837d0e1e..29677b42 100644
--- a/lustrec_tests/lustre_files/metros_1_e2_1102_e2_943.lus
+++ b/lustrec_tests/lustre_files/metros_1_e2_1102_e2_943.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e2_1102_e2_943(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e2_1102_e3_961.lus b/lustrec_tests/lustre_files/metros_1_e2_1102_e3_961.lus
index abe4e2ea..a0701a10 100644
--- a/lustrec_tests/lustre_files/metros_1_e2_1102_e3_961.lus
+++ b/lustrec_tests/lustre_files/metros_1_e2_1102_e3_961.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e2_1102_e3_961(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e2_1102_e7_1163.lus b/lustrec_tests/lustre_files/metros_1_e2_1102_e7_1163.lus
index a06dc573..2bfb5126 100644
--- a/lustrec_tests/lustre_files/metros_1_e2_1102_e7_1163.lus
+++ b/lustrec_tests/lustre_files/metros_1_e2_1102_e7_1163.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e2_1102_e7_1163(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e2_627.lus b/lustrec_tests/lustre_files/metros_1_e2_627.lus
index cca69555..9a643b40 100644
--- a/lustrec_tests/lustre_files/metros_1_e2_627.lus
+++ b/lustrec_tests/lustre_files/metros_1_e2_627.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e2_627(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e7_1255_e7_12.lus b/lustrec_tests/lustre_files/metros_1_e7_1255_e7_12.lus
index a950e14d..d5bf2713 100644
--- a/lustrec_tests/lustre_files/metros_1_e7_1255_e7_12.lus
+++ b/lustrec_tests/lustre_files/metros_1_e7_1255_e7_12.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e7_1255_e7_12(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e7_606.lus b/lustrec_tests/lustre_files/metros_1_e7_606.lus
index fc7d050b..de6e5705 100644
--- a/lustrec_tests/lustre_files/metros_1_e7_606.lus
+++ b/lustrec_tests/lustre_files/metros_1_e7_606.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e7_606(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e8_725.lus b/lustrec_tests/lustre_files/metros_1_e8_725.lus
index 7fda7aac..a2ef7f8e 100644
--- a/lustrec_tests/lustre_files/metros_1_e8_725.lus
+++ b/lustrec_tests/lustre_files/metros_1_e8_725.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e8_725(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e8_725_e1_919.lus b/lustrec_tests/lustre_files/metros_1_e8_725_e1_919.lus
index dd3fdd4f..3de34e25 100644
--- a/lustrec_tests/lustre_files/metros_1_e8_725_e1_919.lus
+++ b/lustrec_tests/lustre_files/metros_1_e8_725_e1_919.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e8_725_e1_919(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e8_725_e2_1144.lus b/lustrec_tests/lustre_files/metros_1_e8_725_e2_1144.lus
index 5b28df89..00e46df9 100644
--- a/lustrec_tests/lustre_files/metros_1_e8_725_e2_1144.lus
+++ b/lustrec_tests/lustre_files/metros_1_e8_725_e2_1144.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e8_725_e2_1144(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_1_e8_725_e3_556.lus b/lustrec_tests/lustre_files/metros_1_e8_725_e3_556.lus
index a2a55716..63b4bd9a 100644
--- a/lustrec_tests/lustre_files/metros_1_e8_725_e3_556.lus
+++ b/lustrec_tests/lustre_files/metros_1_e8_725_e3_556.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_1_e8_725_e3_556(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2.lus b/lustrec_tests/lustre_files/metros_2.lus
index 1be0e9fd..81a44430 100644
--- a/lustrec_tests/lustre_files/metros_2.lus
+++ b/lustrec_tests/lustre_files/metros_2.lus
@@ -45,7 +45,7 @@ let
 tel
 
 -- Not provable?
-node top(B0, B1 : bool; S : bool) 
+node metros_2(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e1_1116.lus b/lustrec_tests/lustre_files/metros_2_e1_1116.lus
index 89eb5467..bbc398be 100644
--- a/lustrec_tests/lustre_files/metros_2_e1_1116.lus
+++ b/lustrec_tests/lustre_files/metros_2_e1_1116.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e1_1116(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e1_1116_e1_556.lus b/lustrec_tests/lustre_files/metros_2_e1_1116_e1_556.lus
index 17e1a9af..592d02cb 100644
--- a/lustrec_tests/lustre_files/metros_2_e1_1116_e1_556.lus
+++ b/lustrec_tests/lustre_files/metros_2_e1_1116_e1_556.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e1_1116_e1_556(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e1_1116_e2_617.lus b/lustrec_tests/lustre_files/metros_2_e1_1116_e2_617.lus
index e82e9f80..d6969c1b 100644
--- a/lustrec_tests/lustre_files/metros_2_e1_1116_e2_617.lus
+++ b/lustrec_tests/lustre_files/metros_2_e1_1116_e2_617.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e1_1116_e2_617(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e1_1116_e3_287.lus b/lustrec_tests/lustre_files/metros_2_e1_1116_e3_287.lus
index f0cd932b..3bf48445 100644
--- a/lustrec_tests/lustre_files/metros_2_e1_1116_e3_287.lus
+++ b/lustrec_tests/lustre_files/metros_2_e1_1116_e3_287.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e1_1116_e3_287(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e1_1116_e7_1440.lus b/lustrec_tests/lustre_files/metros_2_e1_1116_e7_1440.lus
index 7d20b1fe..1841006e 100644
--- a/lustrec_tests/lustre_files/metros_2_e1_1116_e7_1440.lus
+++ b/lustrec_tests/lustre_files/metros_2_e1_1116_e7_1440.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e1_1116_e7_1440(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e1_190.lus b/lustrec_tests/lustre_files/metros_2_e1_190.lus
index 89eb5467..fafb9589 100644
--- a/lustrec_tests/lustre_files/metros_2_e1_190.lus
+++ b/lustrec_tests/lustre_files/metros_2_e1_190.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e1_190(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e2_704_e1_389.lus b/lustrec_tests/lustre_files/metros_2_e2_704_e1_389.lus
index 3102949c..e8ae52d7 100644
--- a/lustrec_tests/lustre_files/metros_2_e2_704_e1_389.lus
+++ b/lustrec_tests/lustre_files/metros_2_e2_704_e1_389.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e2_704_e1_389(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e2_704_e2_13.lus b/lustrec_tests/lustre_files/metros_2_e2_704_e2_13.lus
index a0df140a..9668cdbe 100644
--- a/lustrec_tests/lustre_files/metros_2_e2_704_e2_13.lus
+++ b/lustrec_tests/lustre_files/metros_2_e2_704_e2_13.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e2_704_e2_13(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e2_704_e3_76.lus b/lustrec_tests/lustre_files/metros_2_e2_704_e3_76.lus
index 7e25571b..cf2d2de8 100644
--- a/lustrec_tests/lustre_files/metros_2_e2_704_e3_76.lus
+++ b/lustrec_tests/lustre_files/metros_2_e2_704_e3_76.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e2_704_e3_76(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e2_704_e7_810.lus b/lustrec_tests/lustre_files/metros_2_e2_704_e7_810.lus
index febf5a7c..13633418 100644
--- a/lustrec_tests/lustre_files/metros_2_e2_704_e7_810.lus
+++ b/lustrec_tests/lustre_files/metros_2_e2_704_e7_810.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e2_704_e7_810(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e2_968.lus b/lustrec_tests/lustre_files/metros_2_e2_968.lus
index ac1bff92..7b7715fc 100644
--- a/lustrec_tests/lustre_files/metros_2_e2_968.lus
+++ b/lustrec_tests/lustre_files/metros_2_e2_968.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e2_968(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_2_e3_112.lus b/lustrec_tests/lustre_files/metros_2_e3_112.lus
index 4270d321..87949d1b 100644
--- a/lustrec_tests/lustre_files/metros_2_e3_112.lus
+++ b/lustrec_tests/lustre_files/metros_2_e3_112.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_2_e3_112(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0, nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3.lus b/lustrec_tests/lustre_files/metros_3.lus
index 99ebaf0d..bf73b416 100644
--- a/lustrec_tests/lustre_files/metros_3.lus
+++ b/lustrec_tests/lustre_files/metros_3.lus
@@ -45,7 +45,7 @@ let
 tel
 
 -- Not provable?
-node top(B0, B1 : bool; S : bool) 
+node metros_3(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e3_1275.lus b/lustrec_tests/lustre_files/metros_3_e3_1275.lus
index 9e58d47f..66b903c1 100644
--- a/lustrec_tests/lustre_files/metros_3_e3_1275.lus
+++ b/lustrec_tests/lustre_files/metros_3_e3_1275.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e3_1275(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e3_1275_e1_1350.lus b/lustrec_tests/lustre_files/metros_3_e3_1275_e1_1350.lus
index 979b790e..c3f1ac75 100644
--- a/lustrec_tests/lustre_files/metros_3_e3_1275_e1_1350.lus
+++ b/lustrec_tests/lustre_files/metros_3_e3_1275_e1_1350.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e3_1275_e1_1350(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e3_1275_e2_454.lus b/lustrec_tests/lustre_files/metros_3_e3_1275_e2_454.lus
index 6db4ffbb..849914ed 100644
--- a/lustrec_tests/lustre_files/metros_3_e3_1275_e2_454.lus
+++ b/lustrec_tests/lustre_files/metros_3_e3_1275_e2_454.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e3_1275_e2_454(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e3_1275_e3_640.lus b/lustrec_tests/lustre_files/metros_3_e3_1275_e3_640.lus
index f153e8ef..41d5b1e8 100644
--- a/lustrec_tests/lustre_files/metros_3_e3_1275_e3_640.lus
+++ b/lustrec_tests/lustre_files/metros_3_e3_1275_e3_640.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e3_1275_e3_640(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e3_1275_e4_164.lus b/lustrec_tests/lustre_files/metros_3_e3_1275_e4_164.lus
index 90951645..1f57ef4f 100644
--- a/lustrec_tests/lustre_files/metros_3_e3_1275_e4_164.lus
+++ b/lustrec_tests/lustre_files/metros_3_e3_1275_e4_164.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e3_1275_e4_164(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e3_1275_e5_846.lus b/lustrec_tests/lustre_files/metros_3_e3_1275_e5_846.lus
index 50c08d37..984a23df 100644
--- a/lustrec_tests/lustre_files/metros_3_e3_1275_e5_846.lus
+++ b/lustrec_tests/lustre_files/metros_3_e3_1275_e5_846.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e3_1275_e5_846(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e3_1275_e6_1315.lus b/lustrec_tests/lustre_files/metros_3_e3_1275_e6_1315.lus
index c485870b..7f55f242 100644
--- a/lustrec_tests/lustre_files/metros_3_e3_1275_e6_1315.lus
+++ b/lustrec_tests/lustre_files/metros_3_e3_1275_e6_1315.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e3_1275_e6_1315(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e3_1275_e7_529.lus b/lustrec_tests/lustre_files/metros_3_e3_1275_e7_529.lus
index 6cd560f4..29c22afb 100644
--- a/lustrec_tests/lustre_files/metros_3_e3_1275_e7_529.lus
+++ b/lustrec_tests/lustre_files/metros_3_e3_1275_e7_529.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e3_1275_e7_529(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e4_987.lus b/lustrec_tests/lustre_files/metros_3_e4_987.lus
index 8eacd669..e6044307 100644
--- a/lustrec_tests/lustre_files/metros_3_e4_987.lus
+++ b/lustrec_tests/lustre_files/metros_3_e4_987.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e4_987(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e4_987_e2_80.lus b/lustrec_tests/lustre_files/metros_3_e4_987_e2_80.lus
index bc862c98..801f5cf8 100644
--- a/lustrec_tests/lustre_files/metros_3_e4_987_e2_80.lus
+++ b/lustrec_tests/lustre_files/metros_3_e4_987_e2_80.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e4_987_e2_80(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_3_e4_987_e3_291.lus b/lustrec_tests/lustre_files/metros_3_e4_987_e3_291.lus
index d685d30e..16312332 100644
--- a/lustrec_tests/lustre_files/metros_3_e4_987_e3_291.lus
+++ b/lustrec_tests/lustre_files/metros_3_e4_987_e3_291.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0, B1 : bool; S : bool) 
+node metros_3_e4_987_e3_291(B0, B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4.lus b/lustrec_tests/lustre_files/metros_4.lus
index 9f645ecd..0bd00310 100644
--- a/lustrec_tests/lustre_files/metros_4.lus
+++ b/lustrec_tests/lustre_files/metros_4.lus
@@ -45,7 +45,7 @@ let
 tel
 
 -- Not provable?
-node top(B0,B1 : bool; S : bool) 
+node metros_4(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e1_821_e5_911.lus b/lustrec_tests/lustre_files/metros_4_e1_821_e5_911.lus
index ded56bf1..64a83543 100644
--- a/lustrec_tests/lustre_files/metros_4_e1_821_e5_911.lus
+++ b/lustrec_tests/lustre_files/metros_4_e1_821_e5_911.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e1_821_e5_911(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e1_917.lus b/lustrec_tests/lustre_files/metros_4_e1_917.lus
index 4f36a1a7..86edbb6e 100644
--- a/lustrec_tests/lustre_files/metros_4_e1_917.lus
+++ b/lustrec_tests/lustre_files/metros_4_e1_917.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e1_917(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e2_968.lus b/lustrec_tests/lustre_files/metros_4_e2_968.lus
index 3d646011..0686b272 100644
--- a/lustrec_tests/lustre_files/metros_4_e2_968.lus
+++ b/lustrec_tests/lustre_files/metros_4_e2_968.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e2_968(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e2_968_e1_956.lus b/lustrec_tests/lustre_files/metros_4_e2_968_e1_956.lus
index 425b43e8..d879ff62 100644
--- a/lustrec_tests/lustre_files/metros_4_e2_968_e1_956.lus
+++ b/lustrec_tests/lustre_files/metros_4_e2_968_e1_956.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e2_968_e1_956(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e2_968_e2_1166.lus b/lustrec_tests/lustre_files/metros_4_e2_968_e2_1166.lus
index e0a5a289..562c5a62 100644
--- a/lustrec_tests/lustre_files/metros_4_e2_968_e2_1166.lus
+++ b/lustrec_tests/lustre_files/metros_4_e2_968_e2_1166.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e2_968_e2_1166(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e2_968_e3_931.lus b/lustrec_tests/lustre_files/metros_4_e2_968_e3_931.lus
index 5bde5408..9a58cc28 100644
--- a/lustrec_tests/lustre_files/metros_4_e2_968_e3_931.lus
+++ b/lustrec_tests/lustre_files/metros_4_e2_968_e3_931.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e2_968_e3_931(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e2_968_e4_801.lus b/lustrec_tests/lustre_files/metros_4_e2_968_e4_801.lus
index 0da785b3..805aa5bb 100644
--- a/lustrec_tests/lustre_files/metros_4_e2_968_e4_801.lus
+++ b/lustrec_tests/lustre_files/metros_4_e2_968_e4_801.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e2_968_e4_801(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e2_968_e5_991.lus b/lustrec_tests/lustre_files/metros_4_e2_968_e5_991.lus
index cf1dfd71..118a4b4c 100644
--- a/lustrec_tests/lustre_files/metros_4_e2_968_e5_991.lus
+++ b/lustrec_tests/lustre_files/metros_4_e2_968_e5_991.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e2_968_e5_991(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e2_968_e6_236.lus b/lustrec_tests/lustre_files/metros_4_e2_968_e6_236.lus
index abd95428..8a2d7194 100644
--- a/lustrec_tests/lustre_files/metros_4_e2_968_e6_236.lus
+++ b/lustrec_tests/lustre_files/metros_4_e2_968_e6_236.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e2_968_e6_236(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e2_968_e7_860.lus b/lustrec_tests/lustre_files/metros_4_e2_968_e7_860.lus
index 59787fbf..5e805e20 100644
--- a/lustrec_tests/lustre_files/metros_4_e2_968_e7_860.lus
+++ b/lustrec_tests/lustre_files/metros_4_e2_968_e7_860.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e2_968_e7_860(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e3_1025.lus b/lustrec_tests/lustre_files/metros_4_e3_1025.lus
index 50fcb51b..57dbf0ee 100644
--- a/lustrec_tests/lustre_files/metros_4_e3_1025.lus
+++ b/lustrec_tests/lustre_files/metros_4_e3_1025.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e3_1025(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e3_1091.lus b/lustrec_tests/lustre_files/metros_4_e3_1091.lus
index 50fcb51b..52b0194c 100644
--- a/lustrec_tests/lustre_files/metros_4_e3_1091.lus
+++ b/lustrec_tests/lustre_files/metros_4_e3_1091.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e3_1091(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e3_1091_e1_1044.lus b/lustrec_tests/lustre_files/metros_4_e3_1091_e1_1044.lus
index f292f620..263a7b2a 100644
--- a/lustrec_tests/lustre_files/metros_4_e3_1091_e1_1044.lus
+++ b/lustrec_tests/lustre_files/metros_4_e3_1091_e1_1044.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e3_1091_e1_1044(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e3_1091_e2_1317.lus b/lustrec_tests/lustre_files/metros_4_e3_1091_e2_1317.lus
index 3ac8b39b..d3228b78 100644
--- a/lustrec_tests/lustre_files/metros_4_e3_1091_e2_1317.lus
+++ b/lustrec_tests/lustre_files/metros_4_e3_1091_e2_1317.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e3_1091_e2_1317(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e3_1091_e3_522.lus b/lustrec_tests/lustre_files/metros_4_e3_1091_e3_522.lus
index c6ccf1ed..08b2e8a6 100644
--- a/lustrec_tests/lustre_files/metros_4_e3_1091_e3_522.lus
+++ b/lustrec_tests/lustre_files/metros_4_e3_1091_e3_522.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e3_1091_e3_522(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e3_1091_e4_232.lus b/lustrec_tests/lustre_files/metros_4_e3_1091_e4_232.lus
index 26c2602c..d1c41c43 100644
--- a/lustrec_tests/lustre_files/metros_4_e3_1091_e4_232.lus
+++ b/lustrec_tests/lustre_files/metros_4_e3_1091_e4_232.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e3_1091_e4_232(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e5_1150.lus b/lustrec_tests/lustre_files/metros_4_e5_1150.lus
index 7768ab6e..4d928095 100644
--- a/lustrec_tests/lustre_files/metros_4_e5_1150.lus
+++ b/lustrec_tests/lustre_files/metros_4_e5_1150.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e5_1150(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_4_e6_239_e2_307.lus b/lustrec_tests/lustre_files/metros_4_e6_239_e2_307.lus
index abd95428..6c8eac58 100644
--- a/lustrec_tests/lustre_files/metros_4_e6_239_e2_307.lus
+++ b/lustrec_tests/lustre_files/metros_4_e6_239_e2_307.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_4_e6_239_e2_307(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_5.lus b/lustrec_tests/lustre_files/metros_5.lus
index 14001605..ca505eb3 100644
--- a/lustrec_tests/lustre_files/metros_5.lus
+++ b/lustrec_tests/lustre_files/metros_5.lus
@@ -45,7 +45,7 @@ let
 tel
 
 -- Not provable?
-node top(B0,B1 : bool; S : bool) 
+node metros_5(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/metros_5_e4_1208_e1_337.lus b/lustrec_tests/lustre_files/metros_5_e4_1208_e1_337.lus
index ce76d010..75723236 100644
--- a/lustrec_tests/lustre_files/metros_5_e4_1208_e1_337.lus
+++ b/lustrec_tests/lustre_files/metros_5_e4_1208_e1_337.lus
@@ -38,7 +38,7 @@ let
   (diff1,avance1,retard1) = controleur(nB1,nS);
   ast = H0 and H1;
 tel
-node top(B0,B1 : bool; S : bool) 
+node metros_5_e4_1208_e1_337(B0,B1 : bool; S : bool) 
 returns (OK:bool);
 --@ contract guarantee OK;
 var nB0,nB1 : int;
diff --git a/lustrec_tests/lustre_files/microwave01.lus b/lustrec_tests/lustre_files/microwave01.lus
index c6ed6fe5..41bc9e66 100644
--- a/lustrec_tests/lustre_files/microwave01.lus
+++ b/lustrec_tests/lustre_files/microwave01.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave01(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave02.lus b/lustrec_tests/lustre_files/microwave02.lus
index a3c31a94..5780cd51 100644
--- a/lustrec_tests/lustre_files/microwave02.lus
+++ b/lustrec_tests/lustre_files/microwave02.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave02(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave03.lus b/lustrec_tests/lustre_files/microwave03.lus
index 552baf18..61697b59 100644
--- a/lustrec_tests/lustre_files/microwave03.lus
+++ b/lustrec_tests/lustre_files/microwave03.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave03(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave04.lus b/lustrec_tests/lustre_files/microwave04.lus
index 5a0720e5..77665515 100644
--- a/lustrec_tests/lustre_files/microwave04.lus
+++ b/lustrec_tests/lustre_files/microwave04.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave04(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave05.lus b/lustrec_tests/lustre_files/microwave05.lus
index 5b88b1b5..2579bc82 100644
--- a/lustrec_tests/lustre_files/microwave05.lus
+++ b/lustrec_tests/lustre_files/microwave05.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave05(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave06.lus b/lustrec_tests/lustre_files/microwave06.lus
index 4acfe481..823bce7a 100644
--- a/lustrec_tests/lustre_files/microwave06.lus
+++ b/lustrec_tests/lustre_files/microwave06.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave06(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave07.lus b/lustrec_tests/lustre_files/microwave07.lus
index b295b079..7bd6f5e9 100644
--- a/lustrec_tests/lustre_files/microwave07.lus
+++ b/lustrec_tests/lustre_files/microwave07.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave07(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave08.lus b/lustrec_tests/lustre_files/microwave08.lus
index 4b79dcac..d7554827 100644
--- a/lustrec_tests/lustre_files/microwave08.lus
+++ b/lustrec_tests/lustre_files/microwave08.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave08(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave09.lus b/lustrec_tests/lustre_files/microwave09.lus
index 606f3fa2..a1ef7547 100644
--- a/lustrec_tests/lustre_files/microwave09.lus
+++ b/lustrec_tests/lustre_files/microwave09.lus
@@ -1,5 +1,5 @@
 
-node top(KP_START: bool; 
+node microwave09(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave10.lus b/lustrec_tests/lustre_files/microwave10.lus
index 88c51d11..751865b3 100644
--- a/lustrec_tests/lustre_files/microwave10.lus
+++ b/lustrec_tests/lustre_files/microwave10.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave10(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave11.lus b/lustrec_tests/lustre_files/microwave11.lus
index e87b100d..05a1ed0a 100644
--- a/lustrec_tests/lustre_files/microwave11.lus
+++ b/lustrec_tests/lustre_files/microwave11.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave11(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave12.lus b/lustrec_tests/lustre_files/microwave12.lus
index 660ce02b..8bcd7fef 100644
--- a/lustrec_tests/lustre_files/microwave12.lus
+++ b/lustrec_tests/lustre_files/microwave12.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave12(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave13.lus b/lustrec_tests/lustre_files/microwave13.lus
index 28b697b4..6047e005 100644
--- a/lustrec_tests/lustre_files/microwave13.lus
+++ b/lustrec_tests/lustre_files/microwave13.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave13(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave14.lus b/lustrec_tests/lustre_files/microwave14.lus
index e4e7e7a8..40f9acc7 100644
--- a/lustrec_tests/lustre_files/microwave14.lus
+++ b/lustrec_tests/lustre_files/microwave14.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave14(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave15.lus b/lustrec_tests/lustre_files/microwave15.lus
index a3ab42af..b9a88f95 100644
--- a/lustrec_tests/lustre_files/microwave15.lus
+++ b/lustrec_tests/lustre_files/microwave15.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave15(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave16.lus b/lustrec_tests/lustre_files/microwave16.lus
index 7fbd2152..b3913672 100644
--- a/lustrec_tests/lustre_files/microwave16.lus
+++ b/lustrec_tests/lustre_files/microwave16.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave16(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave17.lus b/lustrec_tests/lustre_files/microwave17.lus
index 1aeeffe0..2a1c49e6 100644
--- a/lustrec_tests/lustre_files/microwave17.lus
+++ b/lustrec_tests/lustre_files/microwave17.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave17(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave18.lus b/lustrec_tests/lustre_files/microwave18.lus
index 81f7c270..0afc0ce5 100644
--- a/lustrec_tests/lustre_files/microwave18.lus
+++ b/lustrec_tests/lustre_files/microwave18.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave18(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave19.lus b/lustrec_tests/lustre_files/microwave19.lus
index daa6af76..98fac687 100644
--- a/lustrec_tests/lustre_files/microwave19.lus
+++ b/lustrec_tests/lustre_files/microwave19.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave19(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave20.lus b/lustrec_tests/lustre_files/microwave20.lus
index d5dc76ae..b224a2be 100644
--- a/lustrec_tests/lustre_files/microwave20.lus
+++ b/lustrec_tests/lustre_files/microwave20.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave20(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave21.lus b/lustrec_tests/lustre_files/microwave21.lus
index f0e756a7..d40609bc 100644
--- a/lustrec_tests/lustre_files/microwave21.lus
+++ b/lustrec_tests/lustre_files/microwave21.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave21(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave22.lus b/lustrec_tests/lustre_files/microwave22.lus
index f84e1766..1da8e041 100644
--- a/lustrec_tests/lustre_files/microwave22.lus
+++ b/lustrec_tests/lustre_files/microwave22.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave22(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave23.lus b/lustrec_tests/lustre_files/microwave23.lus
index b7ad91ce..5994fc94 100644
--- a/lustrec_tests/lustre_files/microwave23.lus
+++ b/lustrec_tests/lustre_files/microwave23.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave23(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave24.lus b/lustrec_tests/lustre_files/microwave24.lus
index 4ecf9127..f36f03f9 100644
--- a/lustrec_tests/lustre_files/microwave24.lus
+++ b/lustrec_tests/lustre_files/microwave24.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave24(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave25.lus b/lustrec_tests/lustre_files/microwave25.lus
index fc7552ab..87503445 100644
--- a/lustrec_tests/lustre_files/microwave25.lus
+++ b/lustrec_tests/lustre_files/microwave25.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave25(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave27.lus b/lustrec_tests/lustre_files/microwave27.lus
index 74dc45fd..d40755ee 100644
--- a/lustrec_tests/lustre_files/microwave27.lus
+++ b/lustrec_tests/lustre_files/microwave27.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave27(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave28.lus b/lustrec_tests/lustre_files/microwave28.lus
index 3e48ed93..60fa550c 100644
--- a/lustrec_tests/lustre_files/microwave28.lus
+++ b/lustrec_tests/lustre_files/microwave28.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave28(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave30.lus b/lustrec_tests/lustre_files/microwave30.lus
index 497b2358..bf534cb7 100644
--- a/lustrec_tests/lustre_files/microwave30.lus
+++ b/lustrec_tests/lustre_files/microwave30.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave30(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave31.lus b/lustrec_tests/lustre_files/microwave31.lus
index 3104f25d..6359c7a0 100644
--- a/lustrec_tests/lustre_files/microwave31.lus
+++ b/lustrec_tests/lustre_files/microwave31.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave31(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave32.lus b/lustrec_tests/lustre_files/microwave32.lus
index 3f7e6dd0..58b6353d 100644
--- a/lustrec_tests/lustre_files/microwave32.lus
+++ b/lustrec_tests/lustre_files/microwave32.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave32(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave33.lus b/lustrec_tests/lustre_files/microwave33.lus
index 2b42604b..206ca2e3 100644
--- a/lustrec_tests/lustre_files/microwave33.lus
+++ b/lustrec_tests/lustre_files/microwave33.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave33(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave34.lus b/lustrec_tests/lustre_files/microwave34.lus
index 99292103..a2df24af 100644
--- a/lustrec_tests/lustre_files/microwave34.lus
+++ b/lustrec_tests/lustre_files/microwave34.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave34(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave35.lus b/lustrec_tests/lustre_files/microwave35.lus
index 081fdf7d..b6f450cc 100644
--- a/lustrec_tests/lustre_files/microwave35.lus
+++ b/lustrec_tests/lustre_files/microwave35.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave35(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave36.lus b/lustrec_tests/lustre_files/microwave36.lus
index 4d8ab5a9..e848b3a7 100644
--- a/lustrec_tests/lustre_files/microwave36.lus
+++ b/lustrec_tests/lustre_files/microwave36.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave36(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave37.lus b/lustrec_tests/lustre_files/microwave37.lus
index f8ba040c..2a64075f 100644
--- a/lustrec_tests/lustre_files/microwave37.lus
+++ b/lustrec_tests/lustre_files/microwave37.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave37(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave38.lus b/lustrec_tests/lustre_files/microwave38.lus
index 58409bd5..d9bc764b 100644
--- a/lustrec_tests/lustre_files/microwave38.lus
+++ b/lustrec_tests/lustre_files/microwave38.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave38(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave39.lus b/lustrec_tests/lustre_files/microwave39.lus
index 3072ea4e..9cf926a0 100644
--- a/lustrec_tests/lustre_files/microwave39.lus
+++ b/lustrec_tests/lustre_files/microwave39.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave39(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/microwave40.lus b/lustrec_tests/lustre_files/microwave40.lus
index 1c7eb43c..c3ec8da4 100644
--- a/lustrec_tests/lustre_files/microwave40.lus
+++ b/lustrec_tests/lustre_files/microwave40.lus
@@ -1,4 +1,4 @@
-node top(KP_START: bool; 
+node microwave40(KP_START: bool; 
       KP_CLEAR: bool; 
       KP_0: bool; 
       KP_1: bool; 
diff --git a/lustrec_tests/lustre_files/peterson_1.lus b/lustrec_tests/lustre_files/peterson_1.lus
index 3d9c3603..763d6998 100644
--- a/lustrec_tests/lustre_files/peterson_1.lus
+++ b/lustrec_tests/lustre_files/peterson_1.lus
@@ -119,7 +119,7 @@ let
 
 tel
 
-node top(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
+node peterson_1(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13 : int;
diff --git a/lustrec_tests/lustre_files/peterson_1_e7_4234.lus b/lustrec_tests/lustre_files/peterson_1_e7_4234.lus
index 0a2bf2f7..0e7f3a0d 100644
--- a/lustrec_tests/lustre_files/peterson_1_e7_4234.lus
+++ b/lustrec_tests/lustre_files/peterson_1_e7_4234.lus
@@ -100,7 +100,7 @@ let
    if(e12) then if(g12) then pre x13-1 else pre x13 else 
    pre x13;
 tel
-node top(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
+node peterson_1_e7_4234(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13 : int;
diff --git a/lustrec_tests/lustre_files/peterson_2.lus b/lustrec_tests/lustre_files/peterson_2.lus
index f8cd8460..45d2e276 100644
--- a/lustrec_tests/lustre_files/peterson_2.lus
+++ b/lustrec_tests/lustre_files/peterson_2.lus
@@ -119,7 +119,7 @@ let
 
 tel
 
-node top(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
+node peterson_2(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13 : int;
diff --git a/lustrec_tests/lustre_files/peterson_3.lus b/lustrec_tests/lustre_files/peterson_3.lus
index 688e0f77..9c9dac4a 100644
--- a/lustrec_tests/lustre_files/peterson_3.lus
+++ b/lustrec_tests/lustre_files/peterson_3.lus
@@ -119,7 +119,7 @@ let
 
 tel
 
-node top(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
+node peterson_3(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13 : int;
diff --git a/lustrec_tests/lustre_files/peterson_4.lus b/lustrec_tests/lustre_files/peterson_4.lus
index fce518bf..18330c0a 100644
--- a/lustrec_tests/lustre_files/peterson_4.lus
+++ b/lustrec_tests/lustre_files/peterson_4.lus
@@ -119,7 +119,7 @@ let
 
 tel
 
-node top(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
+node peterson_4(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13 : int;
diff --git a/lustrec_tests/lustre_files/peterson_all.lus b/lustrec_tests/lustre_files/peterson_all.lus
index ec996d39..58aa00e2 100644
--- a/lustrec_tests/lustre_files/peterson_all.lus
+++ b/lustrec_tests/lustre_files/peterson_all.lus
@@ -119,7 +119,7 @@ let
 
 tel
 
-node top(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
+node peterson_all(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13 : int;
diff --git a/lustrec_tests/lustre_files/peterson_vt.lus b/lustrec_tests/lustre_files/peterson_vt.lus
index 99e3fbf4..cf88528f 100644
--- a/lustrec_tests/lustre_files/peterson_vt.lus
+++ b/lustrec_tests/lustre_files/peterson_vt.lus
@@ -120,7 +120,7 @@ let
 tel
 
 -- Not provable?
-node top(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
+node peterson_vt(e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13 : int;
diff --git a/lustrec_tests/lustre_files/readwrit.lus b/lustrec_tests/lustre_files/readwrit.lus
index 0f6c45f0..7000442e 100644
--- a/lustrec_tests/lustre_files/readwrit.lus
+++ b/lustrec_tests/lustre_files/readwrit.lus
@@ -107,7 +107,7 @@ let
 
 tel
 
-node top(etat1, etat2, etat3, etat4, etat5, etat6, etat7, etat8, etat9 : bool)
+node readwrit(etat1, etat2, etat3, etat4, etat5, etat6, etat7, etat8, etat9 : bool)
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
    var x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12 : int;
diff --git a/lustrec_tests/lustre_files/rtp_1.lus b/lustrec_tests/lustre_files/rtp_1.lus
index 71461444..d71e38a1 100644
--- a/lustrec_tests/lustre_files/rtp_1.lus
+++ b/lustrec_tests/lustre_files/rtp_1.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_1( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_10.lus b/lustrec_tests/lustre_files/rtp_10.lus
index 7e7c7693..b863ae86 100644
--- a/lustrec_tests/lustre_files/rtp_10.lus
+++ b/lustrec_tests/lustre_files/rtp_10.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_10( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_10_e7_106_e7_2564.lus b/lustrec_tests/lustre_files/rtp_10_e7_106_e7_2564.lus
index 2e90ce5e..c3993e0a 100644
--- a/lustrec_tests/lustre_files/rtp_10_e7_106_e7_2564.lus
+++ b/lustrec_tests/lustre_files/rtp_10_e7_106_e7_2564.lus
@@ -80,7 +80,7 @@ let
    if(e12) then if(g12) then pre X9-1 else pre X9 else 
    pre X9;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_10_e7_106_e7_2564( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_2.lus b/lustrec_tests/lustre_files/rtp_2.lus
index 99d54f78..443728f5 100644
--- a/lustrec_tests/lustre_files/rtp_2.lus
+++ b/lustrec_tests/lustre_files/rtp_2.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_2( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_3.lus b/lustrec_tests/lustre_files/rtp_3.lus
index 83b11f2a..48d13c45 100644
--- a/lustrec_tests/lustre_files/rtp_3.lus
+++ b/lustrec_tests/lustre_files/rtp_3.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_3( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_4.lus b/lustrec_tests/lustre_files/rtp_4.lus
index c60e8df3..770f866f 100644
--- a/lustrec_tests/lustre_files/rtp_4.lus
+++ b/lustrec_tests/lustre_files/rtp_4.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_4( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_5.lus b/lustrec_tests/lustre_files/rtp_5.lus
index 51511bf0..139dc455 100644
--- a/lustrec_tests/lustre_files/rtp_5.lus
+++ b/lustrec_tests/lustre_files/rtp_5.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_5( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_5_e7_3972.lus b/lustrec_tests/lustre_files/rtp_5_e7_3972.lus
index 435c7e4d..666efa01 100644
--- a/lustrec_tests/lustre_files/rtp_5_e7_3972.lus
+++ b/lustrec_tests/lustre_files/rtp_5_e7_3972.lus
@@ -80,7 +80,7 @@ let
    if(e12) then if(g12) then pre X9-1 else pre X9 else 
    pre X9;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_5_e7_3972( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_6.lus b/lustrec_tests/lustre_files/rtp_6.lus
index 3b164f82..5e42e339 100644
--- a/lustrec_tests/lustre_files/rtp_6.lus
+++ b/lustrec_tests/lustre_files/rtp_6.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_6( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_7.lus b/lustrec_tests/lustre_files/rtp_7.lus
index 914f501d..2f100b96 100644
--- a/lustrec_tests/lustre_files/rtp_7.lus
+++ b/lustrec_tests/lustre_files/rtp_7.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_7( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_8.lus b/lustrec_tests/lustre_files/rtp_8.lus
index 40ba06ea..e1c00ff1 100644
--- a/lustrec_tests/lustre_files/rtp_8.lus
+++ b/lustrec_tests/lustre_files/rtp_8.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_8( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_9.lus b/lustrec_tests/lustre_files/rtp_9.lus
index aaf814b2..1a01608a 100644
--- a/lustrec_tests/lustre_files/rtp_9.lus
+++ b/lustrec_tests/lustre_files/rtp_9.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_9( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_all.lus b/lustrec_tests/lustre_files/rtp_all.lus
index 3d3c507c..8b06738a 100644
--- a/lustrec_tests/lustre_files/rtp_all.lus
+++ b/lustrec_tests/lustre_files/rtp_all.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_all( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_all_e7_2500.lus b/lustrec_tests/lustre_files/rtp_all_e7_2500.lus
index 6318667f..8c580d68 100644
--- a/lustrec_tests/lustre_files/rtp_all_e7_2500.lus
+++ b/lustrec_tests/lustre_files/rtp_all_e7_2500.lus
@@ -80,7 +80,7 @@ let
    if(e12) then if(g12) then pre X9-1 else pre X9 else 
    pre X9;
 tel
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_all_e7_2500( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK : bool );
 --@ contract guarantee OK;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/rtp_vt.lus b/lustrec_tests/lustre_files/rtp_vt.lus
index f4a6db43..45426bbc 100644
--- a/lustrec_tests/lustre_files/rtp_vt.lus
+++ b/lustrec_tests/lustre_files/rtp_vt.lus
@@ -95,7 +95,7 @@ let
 
 tel
 
-node top( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
+node rtp_vt( e01, e02, e03, e04, e05, e06, e07, e08, e09, e10, e11, e12 : bool )
 returns ( OK:bool );
 --@ contract guarantee OK;
     var X1, X2, X3, X4, X5, X6, X7, X8, X9 : int;
diff --git a/lustrec_tests/lustre_files/speed2.lus b/lustrec_tests/lustre_files/speed2.lus
index 2d9aa5cc..7dc631cc 100644
--- a/lustrec_tests/lustre_files/speed2.lus
+++ b/lustrec_tests/lustre_files/speed2.lus
@@ -22,7 +22,7 @@ let
                   else (diff <= -10);
 tel
 --subrange [0, 2] of int
-node top(beacon,second:bool) returns (OK:bool);
+node speed2(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed2_e7_223_e7_213.lus b/lustrec_tests/lustre_files/speed2_e7_223_e7_213.lus
index 3420216c..6a2b8df6 100644
--- a/lustrec_tests/lustre_files/speed2_e7_223_e7_213.lus
+++ b/lustrec_tests/lustre_files/speed2_e7_223_e7_213.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed2_e7_223_e7_213(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed2_e7_223_e8_329.lus b/lustrec_tests/lustre_files/speed2_e7_223_e8_329.lus
index e291c2ed..eff12edb 100644
--- a/lustrec_tests/lustre_files/speed2_e7_223_e8_329.lus
+++ b/lustrec_tests/lustre_files/speed2_e7_223_e8_329.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed2_e7_223_e8_329(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed2_e7_496.lus b/lustrec_tests/lustre_files/speed2_e7_496.lus
index 9411f057..2281b80c 100644
--- a/lustrec_tests/lustre_files/speed2_e7_496.lus
+++ b/lustrec_tests/lustre_files/speed2_e7_496.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed2_e7_496(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed2_e8_449.lus b/lustrec_tests/lustre_files/speed2_e8_449.lus
index 37a00e2d..b633f1c7 100644
--- a/lustrec_tests/lustre_files/speed2_e8_449.lus
+++ b/lustrec_tests/lustre_files/speed2_e8_449.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed2_e8_449(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed2_e8_449_e7_353.lus b/lustrec_tests/lustre_files/speed2_e8_449_e7_353.lus
index 84a354ed..cb3c75b3 100644
--- a/lustrec_tests/lustre_files/speed2_e8_449_e7_353.lus
+++ b/lustrec_tests/lustre_files/speed2_e8_449_e7_353.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed2_e8_449_e7_353(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed2_e8_449_e8_517.lus b/lustrec_tests/lustre_files/speed2_e8_449_e8_517.lus
index 3e7c7b70..088d3a94 100644
--- a/lustrec_tests/lustre_files/speed2_e8_449_e8_517.lus
+++ b/lustrec_tests/lustre_files/speed2_e8_449_e8_517.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed2_e8_449_e8_517(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 3-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed2_e8_750.lus b/lustrec_tests/lustre_files/speed2_e8_750.lus
index 37a00e2d..dde0ed59 100644
--- a/lustrec_tests/lustre_files/speed2_e8_750.lus
+++ b/lustrec_tests/lustre_files/speed2_e8_750.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed2_e8_750(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed_e7_207.lus b/lustrec_tests/lustre_files/speed_e7_207.lus
index 050a8dec..1ad3a9a0 100644
--- a/lustrec_tests/lustre_files/speed_e7_207.lus
+++ b/lustrec_tests/lustre_files/speed_e7_207.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed_e7_207(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 1-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed_e7_207_e7_538.lus b/lustrec_tests/lustre_files/speed_e7_207_e7_538.lus
index 8e4de02a..5a3af64a 100644
--- a/lustrec_tests/lustre_files/speed_e7_207_e7_538.lus
+++ b/lustrec_tests/lustre_files/speed_e7_207_e7_538.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed_e7_207_e7_538(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 1-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed_e7_207_e8_507.lus b/lustrec_tests/lustre_files/speed_e7_207_e8_507.lus
index d3c6d238..3ef8150a 100644
--- a/lustrec_tests/lustre_files/speed_e7_207_e8_507.lus
+++ b/lustrec_tests/lustre_files/speed_e7_207_e8_507.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed_e7_207_e8_507(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 1-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed_e7_492.lus b/lustrec_tests/lustre_files/speed_e7_492.lus
index 050a8dec..5e5020dc 100644
--- a/lustrec_tests/lustre_files/speed_e7_492.lus
+++ b/lustrec_tests/lustre_files/speed_e7_492.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed_e7_492(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 1-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed_e8_649.lus b/lustrec_tests/lustre_files/speed_e8_649.lus
index 119e6c19..f1347226 100644
--- a/lustrec_tests/lustre_files/speed_e8_649.lus
+++ b/lustrec_tests/lustre_files/speed_e8_649.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed_e8_649(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 1-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/speed_e8_649_e7_709.lus b/lustrec_tests/lustre_files/speed_e8_649_e7_709.lus
index 7d951c8e..5c4245a8 100644
--- a/lustrec_tests/lustre_files/speed_e8_649_e7_709.lus
+++ b/lustrec_tests/lustre_files/speed_e8_649_e7_709.lus
@@ -19,7 +19,7 @@ let
   late = false -> if pre late then (diff < 0)
                   else (diff <= -10);
 tel
-node top(beacon,second:bool) returns (OK:bool);
+node speed_e8_649_e7_709(beacon,second:bool) returns (OK:bool);
 --@ contract guarantee OK by 1-induction;
 var late,early: bool;
 let
diff --git a/lustrec_tests/lustre_files/stalmark.lus b/lustrec_tests/lustre_files/stalmark.lus
index 80d9f13e..157cce3c 100644
--- a/lustrec_tests/lustre_files/stalmark.lus
+++ b/lustrec_tests/lustre_files/stalmark.lus
@@ -1,4 +1,4 @@
-node top (x:bool) returns (OK:bool);
+node stalmark (x:bool) returns (OK:bool);
 --@ contract guarantee OK by 2-induction;
 var a,b,c:bool;
 let
diff --git a/lustrec_tests/lustre_files/stalmark_e7_27.lus b/lustrec_tests/lustre_files/stalmark_e7_27.lus
index 091d6a16..085bfba4 100644
--- a/lustrec_tests/lustre_files/stalmark_e7_27.lus
+++ b/lustrec_tests/lustre_files/stalmark_e7_27.lus
@@ -1,4 +1,4 @@
-node top (x:bool) returns (OK:bool);
+node stalmark_e7_27 (x:bool) returns (OK:bool);
 --@ contract guarantee OK by 4-induction;
 var a,b,c:bool;
 let
diff --git a/lustrec_tests/lustre_files/stalmark_e7_27_e7_31.lus b/lustrec_tests/lustre_files/stalmark_e7_27_e7_31.lus
index 4c2b21f4..760fdf4a 100644
--- a/lustrec_tests/lustre_files/stalmark_e7_27_e7_31.lus
+++ b/lustrec_tests/lustre_files/stalmark_e7_27_e7_31.lus
@@ -1,4 +1,4 @@
-node top (x:bool) returns (OK:bool);
+node stalmark_e7_27_e7_31 (x:bool) returns (OK:bool);
 --@ contract guarantee OK by 4-induction;
 var a,b,c:bool;
 let
diff --git a/lustrec_tests/lustre_files/stalmark_e7_76.lus b/lustrec_tests/lustre_files/stalmark_e7_76.lus
index b8a6698a..5a3639e6 100644
--- a/lustrec_tests/lustre_files/stalmark_e7_76.lus
+++ b/lustrec_tests/lustre_files/stalmark_e7_76.lus
@@ -1,4 +1,4 @@
-node top (x:bool) returns (OK:bool);
+node stalmark_e7_76 (x:bool) returns (OK:bool);
 --@ contract guarantee OK by 4-induction;
 var a,b,c:bool;
 let
diff --git a/lustrec_tests/lustre_files/stalmark_e8_48.lus b/lustrec_tests/lustre_files/stalmark_e8_48.lus
index 5d02c4de..85cbec07 100644
--- a/lustrec_tests/lustre_files/stalmark_e8_48.lus
+++ b/lustrec_tests/lustre_files/stalmark_e8_48.lus
@@ -1,4 +1,4 @@
-node top (x:bool) returns (OK:bool);
+node stalmark_e8_48 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var a,b,c:bool;
 let
diff --git a/lustrec_tests/lustre_files/stalmark_e8_64.lus b/lustrec_tests/lustre_files/stalmark_e8_64.lus
index 5d02c4de..f690d6df 100644
--- a/lustrec_tests/lustre_files/stalmark_e8_64.lus
+++ b/lustrec_tests/lustre_files/stalmark_e8_64.lus
@@ -1,4 +1,4 @@
-node top (x:bool) returns (OK:bool);
+node stalmark_e8_64 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var a,b,c:bool;
 let
diff --git a/lustrec_tests/lustre_files/stalmark_e8_64_e7_80.lus b/lustrec_tests/lustre_files/stalmark_e8_64_e7_80.lus
index c2119964..6c4a508a 100644
--- a/lustrec_tests/lustre_files/stalmark_e8_64_e7_80.lus
+++ b/lustrec_tests/lustre_files/stalmark_e8_64_e7_80.lus
@@ -1,4 +1,4 @@
-node top (x:bool) returns (OK:bool);
+node stalmark_e8_64_e7_80 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var a,b,c:bool;
 let
diff --git a/lustrec_tests/lustre_files/stalmark_e8_64_e8_207.lus b/lustrec_tests/lustre_files/stalmark_e8_64_e8_207.lus
index 1763aca0..2690f7a8 100644
--- a/lustrec_tests/lustre_files/stalmark_e8_64_e8_207.lus
+++ b/lustrec_tests/lustre_files/stalmark_e8_64_e8_207.lus
@@ -1,4 +1,4 @@
-node top (x:bool) returns (OK:bool);
+node stalmark_e8_64_e8_207 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var a,b,c:bool;
 let
diff --git a/lustrec_tests/lustre_files/steam_boiler.lus b/lustrec_tests/lustre_files/steam_boiler.lus
index c3620567..ae444b78 100644
--- a/lustrec_tests/lustre_files/steam_boiler.lus
+++ b/lustrec_tests/lustre_files/steam_boiler.lus
@@ -627,7 +627,7 @@ let
     SteamOutput(op_mode,steam_defect,steam_repaired); 
 tel
 --ensures OK;
-node top (* steam_boiler *) (
+node steam_boiler (* steam_boiler *) (
   steam_boiler_waiting,physical_units_ready,stop_request:bool; 
   steam,level_defect,steam_defect:int; 
   pump_defect_0,pump_defect_1,pump_defect_2,pump_defect_3,pump_control_defect_0,pump_control_defect_1,pump_control_defect_2,pump_control_defect_3:int; 
diff --git a/lustrec_tests/lustre_files/steam_boiler_no_arr2_e6_3003_e4_15091.lus b/lustrec_tests/lustre_files/steam_boiler_no_arr2_e6_3003_e4_15091.lus
index 7a0e2507..21cdebe3 100644
--- a/lustrec_tests/lustre_files/steam_boiler_no_arr2_e6_3003_e4_15091.lus
+++ b/lustrec_tests/lustre_files/steam_boiler_no_arr2_e6_3003_e4_15091.lus
@@ -622,7 +622,7 @@ let
   (b2,b3)=
     SteamOutput(op_mode_,steam_defect,steam_repaired); 
 tel
-node top(
+node steam_boiler_no_arr2_e6_3003_e4_15091(
   steam_boiler_waiting,physical_units_ready,stop_request:bool; 
   steam,level_defect,steam_defect:int; 
   pump_defect_0,pump_defect_1,pump_defect_2,pump_defect_3,pump_control_defect_0,pump_control_defect_1,pump_control_defect_2,pump_control_defect_3:int; 
diff --git a/lustrec_tests/lustre_files/swimmingpool_1.lus b/lustrec_tests/lustre_files/swimmingpool_1.lus
index 93ca55bf..a99df482 100644
--- a/lustrec_tests/lustre_files/swimmingpool_1.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_1.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_1(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_1_e7_1621.lus b/lustrec_tests/lustre_files/swimmingpool_1_e7_1621.lus
index 17fc484b..610fbf23 100644
--- a/lustrec_tests/lustre_files/swimmingpool_1_e7_1621.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_1_e7_1621.lus
@@ -63,7 +63,7 @@ let
 	p2 = init_p2 -> 
 	pre p2;
 tel
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_1_e7_1621(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_2.lus b/lustrec_tests/lustre_files/swimmingpool_2.lus
index 6f09f002..8e12dbfa 100644
--- a/lustrec_tests/lustre_files/swimmingpool_2.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_2.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_2(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_3.lus b/lustrec_tests/lustre_files/swimmingpool_3.lus
index 20420db7..b7e5ac07 100644
--- a/lustrec_tests/lustre_files/swimmingpool_3.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_3.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_3(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_4.lus b/lustrec_tests/lustre_files/swimmingpool_4.lus
index b8b82eab..2800d204 100644
--- a/lustrec_tests/lustre_files/swimmingpool_4.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_4.lus
@@ -83,7 +83,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_4(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_4_e7_2197.lus b/lustrec_tests/lustre_files/swimmingpool_4_e7_2197.lus
index d0e6f976..860bfa85 100644
--- a/lustrec_tests/lustre_files/swimmingpool_4_e7_2197.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_4_e7_2197.lus
@@ -63,7 +63,7 @@ let
 	p2 = init_p2 -> 
 	pre p2;
 tel
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_4_e7_2197(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_5.lus b/lustrec_tests/lustre_files/swimmingpool_5.lus
index fde9f7d6..d4a3d773 100644
--- a/lustrec_tests/lustre_files/swimmingpool_5.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_5.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_5(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_6.lus b/lustrec_tests/lustre_files/swimmingpool_6.lus
index 6bc19883..c6a6b142 100644
--- a/lustrec_tests/lustre_files/swimmingpool_6.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_6.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_6(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_6_e7_10_e7_341.lus b/lustrec_tests/lustre_files/swimmingpool_6_e7_10_e7_341.lus
index f98fa29e..59f6d336 100644
--- a/lustrec_tests/lustre_files/swimmingpool_6_e7_10_e7_341.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_6_e7_10_e7_341.lus
@@ -63,7 +63,7 @@ let
 	p2 = init_p2 -> 
 	pre p2;
 tel
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_6_e7_10_e7_341(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_6_e7_399.lus b/lustrec_tests/lustre_files/swimmingpool_6_e7_399.lus
index e1e25b5e..65fb44bf 100644
--- a/lustrec_tests/lustre_files/swimmingpool_6_e7_399.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_6_e7_399.lus
@@ -63,7 +63,7 @@ let
 	p2 = init_p2 -> 
 	pre p2;
 tel
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_6_e7_399(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_7.lus b/lustrec_tests/lustre_files/swimmingpool_7.lus
index 8d52fb0a..b7754909 100644
--- a/lustrec_tests/lustre_files/swimmingpool_7.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_7.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_7(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_8.lus b/lustrec_tests/lustre_files/swimmingpool_8.lus
index 2c260eda..81c1b8fd 100644
--- a/lustrec_tests/lustre_files/swimmingpool_8.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_8.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_8(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/swimmingpool_9.lus b/lustrec_tests/lustre_files/swimmingpool_9.lus
index 859aa47b..97f54080 100644
--- a/lustrec_tests/lustre_files/swimmingpool_9.lus
+++ b/lustrec_tests/lustre_files/swimmingpool_9.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
+node swimmingpool_9(e1, e2, e3, e4, e5, e6 : bool;init_p1, init_p2 : int)
 returns ( OK : bool );
 --@ contract guarantee OK;
     var x1, x2, x3, x4, x5, x6, x7, p1, p2 : int;
diff --git a/lustrec_tests/lustre_files/switch.lus b/lustrec_tests/lustre_files/switch.lus
index e63fa7c8..855ed17d 100644
--- a/lustrec_tests/lustre_files/switch.lus
+++ b/lustrec_tests/lustre_files/switch.lus
@@ -12,7 +12,7 @@ let
                   else pre(level);
 tel
 
-node top(set, treset, init:bool) returns (OK:bool);
+node switch(set, treset, init:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var level,level1:bool;
 let
diff --git a/lustrec_tests/lustre_files/switch2.lus b/lustrec_tests/lustre_files/switch2.lus
index 88971703..9760e7db 100644
--- a/lustrec_tests/lustre_files/switch2.lus
+++ b/lustrec_tests/lustre_files/switch2.lus
@@ -13,7 +13,7 @@ let
 tel
 
 --requires assert to be true
-node top(set, treset, init:bool) returns (OK:bool);
+node switch2(set, treset, init:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var level,level1:bool;
 let
diff --git a/lustrec_tests/lustre_files/test_counter2.lus b/lustrec_tests/lustre_files/test_counter2.lus
index 1f0ddc1e..7d2d0a12 100644
--- a/lustrec_tests/lustre_files/test_counter2.lus
+++ b/lustrec_tests/lustre_files/test_counter2.lus
@@ -1,4 +1,4 @@
-node top (x:bool) returns (ok: bool);
+node test_counter2 (x:bool) returns (ok: bool);
 var bit: bool;
     coin: bool;
 let
diff --git a/lustrec_tests/lustre_files/test_ok.lus b/lustrec_tests/lustre_files/test_ok.lus
index 1f0ddc1e..d08c2d13 100644
--- a/lustrec_tests/lustre_files/test_ok.lus
+++ b/lustrec_tests/lustre_files/test_ok.lus
@@ -1,4 +1,4 @@
-node top (x:bool) returns (ok: bool);
+node test_ok (x:bool) returns (ok: bool);
 var bit: bool;
     coin: bool;
 let
diff --git a/lustrec_tests/lustre_files/ticket3i_1.lus b/lustrec_tests/lustre_files/ticket3i_1.lus
index 0ab84126..8e53ef50 100644
--- a/lustrec_tests/lustre_files/ticket3i_1.lus
+++ b/lustrec_tests/lustre_files/ticket3i_1.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_1( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_1_e7_1669.lus b/lustrec_tests/lustre_files/ticket3i_1_e7_1669.lus
index 11ea90a5..c8ef73cf 100644
--- a/lustrec_tests/lustre_files/ticket3i_1_e7_1669.lus
+++ b/lustrec_tests/lustre_files/ticket3i_1_e7_1669.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_1_e7_1669( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_2.lus b/lustrec_tests/lustre_files/ticket3i_2.lus
index f374aa2c..bfd7b711 100644
--- a/lustrec_tests/lustre_files/ticket3i_2.lus
+++ b/lustrec_tests/lustre_files/ticket3i_2.lus
@@ -82,7 +82,7 @@ let
 tel
 
 -- Not provable in luke-bitvec
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_2( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_3.lus b/lustrec_tests/lustre_files/ticket3i_3.lus
index df650502..f4d635cd 100644
--- a/lustrec_tests/lustre_files/ticket3i_3.lus
+++ b/lustrec_tests/lustre_files/ticket3i_3.lus
@@ -82,7 +82,7 @@ let
 tel
 
 -- Not provable in luke-bitvec
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_3( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_3_e7_1312.lus b/lustrec_tests/lustre_files/ticket3i_3_e7_1312.lus
index adc51ee8..4ec8e864 100644
--- a/lustrec_tests/lustre_files/ticket3i_3_e7_1312.lus
+++ b/lustrec_tests/lustre_files/ticket3i_3_e7_1312.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_3_e7_1312( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_3_e7_1312_e7_1495.lus b/lustrec_tests/lustre_files/ticket3i_3_e7_1312_e7_1495.lus
index 05db85a0..4b35ebd5 100644
--- a/lustrec_tests/lustre_files/ticket3i_3_e7_1312_e7_1495.lus
+++ b/lustrec_tests/lustre_files/ticket3i_3_e7_1312_e7_1495.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_3_e7_1312_e7_1495( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_3_e7_1312_e8_1916.lus b/lustrec_tests/lustre_files/ticket3i_3_e7_1312_e8_1916.lus
index be1def0a..8402c3e0 100644
--- a/lustrec_tests/lustre_files/ticket3i_3_e7_1312_e8_1916.lus
+++ b/lustrec_tests/lustre_files/ticket3i_3_e7_1312_e8_1916.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_3_e7_1312_e8_1916( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_3_e7_99.lus b/lustrec_tests/lustre_files/ticket3i_3_e7_99.lus
index adc51ee8..78cd55cc 100644
--- a/lustrec_tests/lustre_files/ticket3i_3_e7_99.lus
+++ b/lustrec_tests/lustre_files/ticket3i_3_e7_99.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_3_e7_99( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_3_e8_1703.lus b/lustrec_tests/lustre_files/ticket3i_3_e8_1703.lus
index 960aab00..58420cf4 100644
--- a/lustrec_tests/lustre_files/ticket3i_3_e8_1703.lus
+++ b/lustrec_tests/lustre_files/ticket3i_3_e8_1703.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_3_e8_1703( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_3_e8_1703_e7_3491.lus b/lustrec_tests/lustre_files/ticket3i_3_e8_1703_e7_3491.lus
index 1b8cc3f8..38cd3179 100644
--- a/lustrec_tests/lustre_files/ticket3i_3_e8_1703_e7_3491.lus
+++ b/lustrec_tests/lustre_files/ticket3i_3_e8_1703_e7_3491.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_3_e8_1703_e7_3491( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_3_e8_1703_e8_2560.lus b/lustrec_tests/lustre_files/ticket3i_3_e8_1703_e8_2560.lus
index 02e8c1d2..20a64507 100644
--- a/lustrec_tests/lustre_files/ticket3i_3_e8_1703_e8_2560.lus
+++ b/lustrec_tests/lustre_files/ticket3i_3_e8_1703_e8_2560.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_3_e8_1703_e8_2560( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_3_e8_1788.lus b/lustrec_tests/lustre_files/ticket3i_3_e8_1788.lus
index 960aab00..a963710d 100644
--- a/lustrec_tests/lustre_files/ticket3i_3_e8_1788.lus
+++ b/lustrec_tests/lustre_files/ticket3i_3_e8_1788.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_3_e8_1788( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_4.lus b/lustrec_tests/lustre_files/ticket3i_4.lus
index 228d75d0..37579374 100644
--- a/lustrec_tests/lustre_files/ticket3i_4.lus
+++ b/lustrec_tests/lustre_files/ticket3i_4.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_4( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_4_e7_1775_e7_3320.lus b/lustrec_tests/lustre_files/ticket3i_4_e7_1775_e7_3320.lus
index e390c1d6..42ed8a57 100644
--- a/lustrec_tests/lustre_files/ticket3i_4_e7_1775_e7_3320.lus
+++ b/lustrec_tests/lustre_files/ticket3i_4_e7_1775_e7_3320.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_4_e7_1775_e7_3320( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_5.lus b/lustrec_tests/lustre_files/ticket3i_5.lus
index 16345d9f..1943a579 100644
--- a/lustrec_tests/lustre_files/ticket3i_5.lus
+++ b/lustrec_tests/lustre_files/ticket3i_5.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_5( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_5_e7_3307.lus b/lustrec_tests/lustre_files/ticket3i_5_e7_3307.lus
index 3e7da7b0..ed8e0173 100644
--- a/lustrec_tests/lustre_files/ticket3i_5_e7_3307.lus
+++ b/lustrec_tests/lustre_files/ticket3i_5_e7_3307.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_5_e7_3307( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_6.lus b/lustrec_tests/lustre_files/ticket3i_6.lus
index cbd691bf..a5f11cdf 100644
--- a/lustrec_tests/lustre_files/ticket3i_6.lus
+++ b/lustrec_tests/lustre_files/ticket3i_6.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_6( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_6_e7_1096_e7_2688.lus b/lustrec_tests/lustre_files/ticket3i_6_e7_1096_e7_2688.lus
index 27a9e049..3253135f 100644
--- a/lustrec_tests/lustre_files/ticket3i_6_e7_1096_e7_2688.lus
+++ b/lustrec_tests/lustre_files/ticket3i_6_e7_1096_e7_2688.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_6_e7_1096_e7_2688( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_7.lus b/lustrec_tests/lustre_files/ticket3i_7.lus
index 98f37723..bdc869e1 100644
--- a/lustrec_tests/lustre_files/ticket3i_7.lus
+++ b/lustrec_tests/lustre_files/ticket3i_7.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_7( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_7_e1_2192_e1_1852.lus b/lustrec_tests/lustre_files/ticket3i_7_e1_2192_e1_1852.lus
index be141b26..120c1934 100644
--- a/lustrec_tests/lustre_files/ticket3i_7_e1_2192_e1_1852.lus
+++ b/lustrec_tests/lustre_files/ticket3i_7_e1_2192_e1_1852.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_7_e1_2192_e1_1852( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 4-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_7_e2_2724_e7_524.lus b/lustrec_tests/lustre_files/ticket3i_7_e2_2724_e7_524.lus
index 0024e841..5fb5060a 100644
--- a/lustrec_tests/lustre_files/ticket3i_7_e2_2724_e7_524.lus
+++ b/lustrec_tests/lustre_files/ticket3i_7_e2_2724_e7_524.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_7_e2_2724_e7_524( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_7_e3_59_e7_2122.lus b/lustrec_tests/lustre_files/ticket3i_7_e3_59_e7_2122.lus
index 5314e46a..b5ad72c4 100644
--- a/lustrec_tests/lustre_files/ticket3i_7_e3_59_e7_2122.lus
+++ b/lustrec_tests/lustre_files/ticket3i_7_e3_59_e7_2122.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_7_e3_59_e7_2122( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_7_e7_3176.lus b/lustrec_tests/lustre_files/ticket3i_7_e7_3176.lus
index 0d82ad86..80daffe8 100644
--- a/lustrec_tests/lustre_files/ticket3i_7_e7_3176.lus
+++ b/lustrec_tests/lustre_files/ticket3i_7_e7_3176.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_7_e7_3176( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_7_e7_3176_e1_2924.lus b/lustrec_tests/lustre_files/ticket3i_7_e7_3176_e1_2924.lus
index 863e51c3..aeb38045 100644
--- a/lustrec_tests/lustre_files/ticket3i_7_e7_3176_e1_2924.lus
+++ b/lustrec_tests/lustre_files/ticket3i_7_e7_3176_e1_2924.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_7_e7_3176_e1_2924( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_7_e8_2126_e7_78.lus b/lustrec_tests/lustre_files/ticket3i_7_e8_2126_e7_78.lus
index 9470f760..253ebf4b 100644
--- a/lustrec_tests/lustre_files/ticket3i_7_e8_2126_e7_78.lus
+++ b/lustrec_tests/lustre_files/ticket3i_7_e8_2126_e7_78.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_7_e8_2126_e7_78( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_all.lus b/lustrec_tests/lustre_files/ticket3i_all.lus
index bf2b31cf..72dacfcf 100644
--- a/lustrec_tests/lustre_files/ticket3i_all.lus
+++ b/lustrec_tests/lustre_files/ticket3i_all.lus
@@ -81,7 +81,7 @@ let
 
 tel
 
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_all( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
diff --git a/lustrec_tests/lustre_files/ticket3i_all_e1_2706_e7_1776.lus b/lustrec_tests/lustre_files/ticket3i_all_e1_2706_e7_1776.lus
index c3eab1e5..c7d7da8d 100644
--- a/lustrec_tests/lustre_files/ticket3i_all_e1_2706_e7_1776.lus
+++ b/lustrec_tests/lustre_files/ticket3i_all_e1_2706_e7_1776.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_all_e1_2706_e7_1776( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_all_e2_1117_e7_553.lus b/lustrec_tests/lustre_files/ticket3i_all_e2_1117_e7_553.lus
index b12ea6f5..e58e8f6d 100644
--- a/lustrec_tests/lustre_files/ticket3i_all_e2_1117_e7_553.lus
+++ b/lustrec_tests/lustre_files/ticket3i_all_e2_1117_e7_553.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_all_e2_1117_e7_553( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_all_e3_557_e7_3464.lus b/lustrec_tests/lustre_files/ticket3i_all_e3_557_e7_3464.lus
index 1052b5e9..e2593f08 100644
--- a/lustrec_tests/lustre_files/ticket3i_all_e3_557_e7_3464.lus
+++ b/lustrec_tests/lustre_files/ticket3i_all_e3_557_e7_3464.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_all_e3_557_e7_3464( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_all_e7_1837.lus b/lustrec_tests/lustre_files/ticket3i_all_e7_1837.lus
index c2953adf..fcc068cb 100644
--- a/lustrec_tests/lustre_files/ticket3i_all_e7_1837.lus
+++ b/lustrec_tests/lustre_files/ticket3i_all_e7_1837.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_all_e7_1837( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_all_e7_591.lus b/lustrec_tests/lustre_files/ticket3i_all_e7_591.lus
index c2953adf..ff7af100 100644
--- a/lustrec_tests/lustre_files/ticket3i_all_e7_591.lus
+++ b/lustrec_tests/lustre_files/ticket3i_all_e7_591.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_all_e7_591( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/ticket3i_all_e8_505_e7_2450.lus b/lustrec_tests/lustre_files/ticket3i_all_e8_505_e7_2450.lus
index 1178f1ab..73ea506c 100644
--- a/lustrec_tests/lustre_files/ticket3i_all_e8_505_e7_2450.lus
+++ b/lustrec_tests/lustre_files/ticket3i_all_e8_505_e7_2450.lus
@@ -67,7 +67,7 @@ let
    if(e7) then if(g7) then pre t else pre a3 else 
    pre a3;
 tel
-node top( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
+node ticket3i_all_e8_505_e7_2450( e1, e2, e3, e4, e5, e6, e7, e8, e9 : bool;
          init_a1, init_a2, init_a3, init_t : int )
 returns ( OK : bool );
 --@ contract guarantee OK;
diff --git a/lustrec_tests/lustre_files/traffic.lus b/lustrec_tests/lustre_files/traffic.lus
index 61a15f0c..958d54c9 100644
--- a/lustrec_tests/lustre_files/traffic.lus
+++ b/lustrec_tests/lustre_files/traffic.lus
@@ -20,7 +20,7 @@ let
      else Prev;
 tel
 
-node top( Delta : int ) returns ( OK : bool );
+node traffic( Delta : int ) returns ( OK : bool );
 --@ contract guarantee OK by 2-induction;
 var Total : int;
 let
diff --git a/lustrec_tests/lustre_files/traffic_e7_46.lus b/lustrec_tests/lustre_files/traffic_e7_46.lus
index a95cf438..3a9202d1 100644
--- a/lustrec_tests/lustre_files/traffic_e7_46.lus
+++ b/lustrec_tests/lustre_files/traffic_e7_46.lus
@@ -11,7 +11,7 @@ let
      else if Delta > 0 and Prev < 10 then Prev+Delta
      else Prev;
 tel
-node top( Delta : int ) returns ( OK : bool );
+node traffic_e7_46( Delta : int ) returns ( OK : bool );
 --@ contract guarantee OK;
 var Total : int;
 let
diff --git a/lustrec_tests/lustre_files/traffic_e7_46_e7_171.lus b/lustrec_tests/lustre_files/traffic_e7_46_e7_171.lus
index 78f0a80a..2fff59d2 100644
--- a/lustrec_tests/lustre_files/traffic_e7_46_e7_171.lus
+++ b/lustrec_tests/lustre_files/traffic_e7_46_e7_171.lus
@@ -11,7 +11,7 @@ let
      else if Delta > 0 and Prev < 10 then Prev+Delta
      else Prev;
 tel
-node top( Delta : int ) returns ( OK : bool );
+node traffic_e7_46_e7_171( Delta : int ) returns ( OK : bool );
 --@ contract guarantee OK;
 var Total : int;
 let
diff --git a/lustrec_tests/lustre_files/tramway.lus b/lustrec_tests/lustre_files/tramway.lus
index 3d47ca04..45c1cd89 100644
--- a/lustrec_tests/lustre_files/tramway.lus
+++ b/lustrec_tests/lustre_files/tramway.lus
@@ -140,7 +140,7 @@ tel
   -- [explain]  |  +---------+  |   +------------+
   -- [explain]  +---------------+-->| property   |-->
   -- [explain]                      +------------+
-node top(request_door, warning_start, in_station, door_is_open: bool)
+node tramway(request_door, warning_start, in_station, door_is_open: bool)
 returns (OK: bool);
 --@ contract guarantee OK by 7-induction;
 var
diff --git a/lustrec_tests/lustre_files/tramway_e7_1834.lus b/lustrec_tests/lustre_files/tramway_e7_1834.lus
index 6680b30f..5c45b9f8 100644
--- a/lustrec_tests/lustre_files/tramway_e7_1834.lus
+++ b/lustrec_tests/lustre_files/tramway_e7_1834.lus
@@ -76,7 +76,7 @@ let
                  edge(not in_station),
                  jafter(door_is_open));
 tel
-node top(request_door, warning_start, in_station, door_is_open: bool)
+node tramway_e7_1834(request_door, warning_start, in_station, door_is_open: bool)
 returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
 var
diff --git a/lustrec_tests/lustre_files/tramway_e7_1834_e7_2363.lus b/lustrec_tests/lustre_files/tramway_e7_1834_e7_2363.lus
index 80982aa0..14ee8c28 100644
--- a/lustrec_tests/lustre_files/tramway_e7_1834_e7_2363.lus
+++ b/lustrec_tests/lustre_files/tramway_e7_1834_e7_2363.lus
@@ -76,7 +76,7 @@ let
                  edge(not in_station),
                  jafter(door_is_open));
 tel
-node top(request_door, warning_start, in_station, door_is_open: bool)
+node tramway_e7_1834_e7_2363(request_door, warning_start, in_station, door_is_open: bool)
 returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
 var
diff --git a/lustrec_tests/lustre_files/tramway_e7_1834_e8_3192.lus b/lustrec_tests/lustre_files/tramway_e7_1834_e8_3192.lus
index 74f0a68a..0ca0227b 100644
--- a/lustrec_tests/lustre_files/tramway_e7_1834_e8_3192.lus
+++ b/lustrec_tests/lustre_files/tramway_e7_1834_e8_3192.lus
@@ -76,7 +76,7 @@ let
                  edge(not in_station),
                  jafter(door_is_open));
 tel
-node top(request_door, warning_start, in_station, door_is_open: bool)
+node tramway_e7_1834_e8_3192(request_door, warning_start, in_station, door_is_open: bool)
 returns (OK: bool);
 --@ contract guarantee OK by 7-induction;
 var
diff --git a/lustrec_tests/lustre_files/tramway_e7_3304.lus b/lustrec_tests/lustre_files/tramway_e7_3304.lus
index 6680b30f..6c0bac52 100644
--- a/lustrec_tests/lustre_files/tramway_e7_3304.lus
+++ b/lustrec_tests/lustre_files/tramway_e7_3304.lus
@@ -76,7 +76,7 @@ let
                  edge(not in_station),
                  jafter(door_is_open));
 tel
-node top(request_door, warning_start, in_station, door_is_open: bool)
+node tramway_e7_3304(request_door, warning_start, in_station, door_is_open: bool)
 returns (OK: bool);
 --@ contract guarantee OK by 2-induction;
 var
diff --git a/lustrec_tests/lustre_files/twisted_counters.lus b/lustrec_tests/lustre_files/twisted_counters.lus
index afb33c25..350a84a7 100644
--- a/lustrec_tests/lustre_files/twisted_counters.lus
+++ b/lustrec_tests/lustre_files/twisted_counters.lus
@@ -30,7 +30,7 @@ let
 tel
 
 
-node top (x:bool) returns (OK:bool);
+node twisted_counters (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var b,d:bool;
 let
diff --git a/lustrec_tests/lustre_files/two_counters_e1_268.lus b/lustrec_tests/lustre_files/two_counters_e1_268.lus
index 254ff981..1bd39e8d 100644
--- a/lustrec_tests/lustre_files/two_counters_e1_268.lus
+++ b/lustrec_tests/lustre_files/two_counters_e1_268.lus
@@ -13,7 +13,7 @@ let
             else pre time +1+ 1;
   out = (time = 2);
 tel
-node top (x:bool) returns (OK:bool);
+node two_counters_e1_268 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var b,d:bool;
 let
diff --git a/lustrec_tests/lustre_files/two_counters_e2_3.lus b/lustrec_tests/lustre_files/two_counters_e2_3.lus
index 742e20c1..9532b95f 100644
--- a/lustrec_tests/lustre_files/two_counters_e2_3.lus
+++ b/lustrec_tests/lustre_files/two_counters_e2_3.lus
@@ -13,7 +13,7 @@ let
             else pre time -1+ 1;
   out = (time = 2);
 tel
-node top (x:bool) returns (OK:bool);
+node two_counters_e2_3 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var b,d:bool;
 let
diff --git a/lustrec_tests/lustre_files/two_counters_e3_325.lus b/lustrec_tests/lustre_files/two_counters_e3_325.lus
index 9fe988c3..59e3f652 100644
--- a/lustrec_tests/lustre_files/two_counters_e3_325.lus
+++ b/lustrec_tests/lustre_files/two_counters_e3_325.lus
@@ -13,7 +13,7 @@ let
             else pre time - 1;
   out = (time = 2);
 tel
-node top (x:bool) returns (OK:bool);
+node two_counters_e3_325 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var b,d:bool;
 let
diff --git a/lustrec_tests/lustre_files/two_counters_e7_222.lus b/lustrec_tests/lustre_files/two_counters_e7_222.lus
index 8af3d1cb..5000bffa 100644
--- a/lustrec_tests/lustre_files/two_counters_e7_222.lus
+++ b/lustrec_tests/lustre_files/two_counters_e7_222.lus
@@ -13,7 +13,7 @@ let
             else pre time + 1;
   out = (time = 2);
 tel
-node top (x:bool) returns (OK:bool);
+node two_counters_e7_222 (x:bool) returns (OK:bool);
 --@ contract guarantee OK;
 var b,d:bool;
 let
diff --git a/lustrec_tests/lustre_files/ums.lus b/lustrec_tests/lustre_files/ums.lus
index 560729b7..7d1a7d75 100644
--- a/lustrec_tests/lustre_files/ums.lus
+++ b/lustrec_tests/lustre_files/ums.lus
@@ -53,7 +53,7 @@ let
    only_on_B = on_B and not(on_A or on_C);
 tel
 
-node top(on_A, on_B, on_C, ack_AB, ack_BC: bool)
+node ums(on_A, on_B, on_C, ack_AB, ack_BC: bool)
 returns(OK: bool);
 --@ contract guarantee OK by 2-induction;
 var
diff --git a/lustrec_tests/lustre_files/ums_e7_1700.lus b/lustrec_tests/lustre_files/ums_e7_1700.lus
index 3ed08027..7e9d8d56 100644
--- a/lustrec_tests/lustre_files/ums_e7_1700.lus
+++ b/lustrec_tests/lustre_files/ums_e7_1700.lus
@@ -41,7 +41,7 @@ let
    empty_section = not(on_A or on_B or on_C);
    only_on_B = on_B and not(on_A or on_C);
 tel
-node top(on_A, on_B, on_C, ack_AB, ack_BC: bool)
+node ums_e7_1700(on_A, on_B, on_C, ack_AB, ack_BC: bool)
 returns(OK: bool);
 --@ contract guarantee OK;
 var
diff --git a/lustrec_tests/lustre_files/ums_e8_1032.lus b/lustrec_tests/lustre_files/ums_e8_1032.lus
index a03d25c6..91a926c3 100644
--- a/lustrec_tests/lustre_files/ums_e8_1032.lus
+++ b/lustrec_tests/lustre_files/ums_e8_1032.lus
@@ -41,7 +41,7 @@ let
    empty_section = not(on_A or on_B or on_C);
    only_on_B = on_B and not(on_A or on_C);
 tel
-node top(on_A, on_B, on_C, ack_AB, ack_BC: bool)
+node ums_e8_1032(on_A, on_B, on_C, ack_AB, ack_BC: bool)
 returns(OK: bool);
 --@ contract guarantee OK by 4-induction;
 var
-- 
GitLab