Refactoring in naming of modules