core module improved module name conflicts