Make sure default names differ between modules & adapt unit tests