Refactoring module name