Refactoring module names.