Refactoring module names to be more concise.