Refactoring the module names by choosing simpler and shorter names