diff --git a/MBB.py b/MBB.py
index 705c4d6d602127d5e5529c912feed644beac44c2..f60ba9342ffa9d8a630f4c54b38c1d04bdf429f5 100755
--- a/MBB.py
+++ b/MBB.py
@@ -23,14 +23,14 @@ import matplotlib as mpl
 import matplotlib.pyplot as plt
 import matplotlib.patches as mpatches
 
-from scripts.MBIutils import categorize
+from scripts.MBButils import categorize
 
 mpl.rcParams['hatch.linewidth'] = 4.5  # hatch linewidth
 
 # Add our lib directory to the PYTHONPATH, and load our utilitary libraries
 sys.path.append(f'{os.path.dirname(os.path.abspath(__file__))}/scripts')
 
-from MBIutils import *
+from MBButils import *
 from LaTeXutils import *
 
 # Plots need big dependancy like numpy and matplotlib, so just ignore
@@ -147,7 +147,7 @@ def cmd_gencodes(level):
         subprocess.run(f'tar -xf real_world_data.csv.tar.gz', shell=True, check=True)
         dir = "scripts/"
         os.chdir(dir)
-        subprocess.run(f'PYTHONPATH=../ python3 main.py --generator_dir errors --level {level} --real_world_data ../output.csv', shell=True, check=True)
+        subprocess.run(f'PYTHONPATH=../ python3 main.py --generator_dir errors --level {level} --real_world_data ../output.csv --remove_previous_generation_results', shell=True, check=True)
     else:
         raise Exception("Cannot find the generators. Please report that bug.")
     os.chdir(here)
diff --git a/scripts/LaTeXutils.py b/scripts/LaTeXutils.py
index 1715461ad0e0275a54b9a08bba09d97a72f854a8..65a3d64c6200845fbb8e035ded0730efb30eef71 100644
--- a/scripts/LaTeXutils.py
+++ b/scripts/LaTeXutils.py
@@ -1,7 +1,7 @@
 # Copyright 2022. The MBI project. All rights reserved.
 # This program is free software; you can redistribute it and/or modify it under the terms of the license (GNU GPL).
 
-from MBIutils import *
+from MBButils import *
 
 possible_features=['P2P!basic', 'P2P!nonblocking', 'P2P!persistent', 'COLL!basic', 'COLL!nonblocking', 'COLL!persistent', 'COLL!tools', 'RMA']
 possible_characterization=["Lacking", "Yes"]
diff --git a/scripts/tools/aislinn.py b/scripts/tools/aislinn.py
index ae76700a850156d4cceac743d3c71c1130eddd33..7b0e7c7efa19af02449f6c54a541a481f839f4bd 100644
--- a/scripts/tools/aislinn.py
+++ b/scripts/tools/aislinn.py
@@ -1,7 +1,7 @@
 import re
 import os
 import sys
-from MBIutils import *
+from MBButils import *
 
 class Tool(AbstractTool):
     def identify(self):
diff --git a/scripts/tools/civl.py b/scripts/tools/civl.py
index 8491ebb86f6278357f2a33e498ce49398dc74969..cd62e7d25b16ca64d9d1de5c1414f7e211740302 100644
--- a/scripts/tools/civl.py
+++ b/scripts/tools/civl.py
@@ -1,6 +1,6 @@
 import re
 import os
-from MBIutils import *
+from MBButils import *
 
 class Tool(AbstractTool):
     def identify(self):
diff --git a/scripts/tools/hermes.py b/scripts/tools/hermes.py
index 9e08a099670b48a728e5f1f9fb0c2574bba50913..e86b8295b545450655aca0ccc8d1c0e1cc44b4ad 100644
--- a/scripts/tools/hermes.py
+++ b/scripts/tools/hermes.py
@@ -3,7 +3,7 @@ import os
 import sys
 import tempfile
 import shutil
-from MBIutils import *
+from MBButils import *
 
 class Tool(AbstractTool):
     def identify(self):
diff --git a/scripts/tools/isp.py b/scripts/tools/isp.py
index 0025c18c9619af1f892dc2f44fa8ff0a86bdaf3c..5d10d7e81abdd03f1a20e00f9dd04b8742fc18b0 100644
--- a/scripts/tools/isp.py
+++ b/scripts/tools/isp.py
@@ -1,6 +1,6 @@
 import re
 import os
-from MBIutils import *
+from MBButils import *
 
 class Tool(AbstractTool):
     def identify(self):
diff --git a/scripts/tools/itac.py b/scripts/tools/itac.py
index 9ad63158111a5fe16730abfe35e150ac8b5620eb..58a14b25da475ba7bc088802e52b8f818815bfb6 100644
--- a/scripts/tools/itac.py
+++ b/scripts/tools/itac.py
@@ -2,7 +2,7 @@ import re
 import os
 import distutils.spawn
 
-from MBIutils import *
+from MBButils import *
 
 
 class Tool(AbstractTool):
diff --git a/scripts/tools/mpi_checker.py b/scripts/tools/mpi_checker.py
index a6fbb4207349005487f5d63cc54fa002c3be808b..8fee7622f129ef0d163a5c48d11b0ecc9f7489c9 100644
--- a/scripts/tools/mpi_checker.py
+++ b/scripts/tools/mpi_checker.py
@@ -1,6 +1,6 @@
 import re
 import os
-from MBIutils import *
+from MBButils import *
 
 class Tool(AbstractTool):
     def identify(self):
diff --git a/scripts/tools/mpisv.py b/scripts/tools/mpisv.py
index c00103e47e095b7578995c05f34af46e04611c90..d8f795c247270f82c7fb442c79928bef99c1f4ad 100644
--- a/scripts/tools/mpisv.py
+++ b/scripts/tools/mpisv.py
@@ -1,7 +1,7 @@
 import re
 import os
 import sys
-from MBIutils import *
+from MBButils import *
 
 class Tool(AbstractTool):
     def identify(self):
diff --git a/scripts/tools/must.py b/scripts/tools/must.py
index 3c6848f41160a41ba4b927ececffb8f98d8b91e9..54d571528e3e049ad4804154dfb374ad771f5094 100644
--- a/scripts/tools/must.py
+++ b/scripts/tools/must.py
@@ -3,7 +3,7 @@ import os
 import tempfile
 import shutil
 import json
-from MBIutils import *
+from MBButils import *
 
 
 def must_filter(line, process):
diff --git a/scripts/tools/parcoach.py b/scripts/tools/parcoach.py
index 0a1b1ec1ca20c4945adf6efd97c4d187d80a4194..a40049f7e038d3dc621ff208a9c1e539ce05002d 100644
--- a/scripts/tools/parcoach.py
+++ b/scripts/tools/parcoach.py
@@ -1,6 +1,6 @@
 import re
 import os
-from MBIutils import *
+from MBButils import *
 
 class Tool(AbstractTool):
     def identify(self):
diff --git a/scripts/tools/simgrid.py b/scripts/tools/simgrid.py
index 3617407f35088436d2f4e520b7329d81a65e50b5..87ddfe36634a7f2128ac8f4a7939a551e7bcc4c8 100644
--- a/scripts/tools/simgrid.py
+++ b/scripts/tools/simgrid.py
@@ -4,7 +4,7 @@
 import re
 import os
 import tempfile
-from MBIutils import *
+from MBButils import *
 
 class Tool(AbstractTool):
     name_ext = ""
diff --git a/scripts/tools/smpi.py b/scripts/tools/smpi.py
index 794428891c83ec864df2c2c0b56399a794dc9a44..5c26250ae68e8ed404ad8a6e28062767dddc3713 100644
--- a/scripts/tools/smpi.py
+++ b/scripts/tools/smpi.py
@@ -1,7 +1,7 @@
 import re
 import os
 import tools.simgrid
-from MBIutils import *
+from MBButils import *
 
 class Tool(tools.simgrid.Tool):
     def identify(self):
diff --git a/scripts/tools/smpivg.py b/scripts/tools/smpivg.py
index 18064d7648de727f86c93d586b8d5f046a2a93e7..d1b5c56a10fef6b22ef9dbacd03cfadd8a1eda9f 100644
--- a/scripts/tools/smpivg.py
+++ b/scripts/tools/smpivg.py
@@ -2,7 +2,7 @@ import re
 import os
 import tools.smpi
 import subprocess
-from MBIutils import *
+from MBButils import *
 
 class Tool(tools.smpi.Tool):
     def identify(self):