Refactored modules names