Refactored module names