Rename modules for clarity