module name refactoring