refactor modules names