refactoring: rename modules