Indicating dummy modules by name and getting rid of "nb" in module names.