Refactored mopdule name