rename modules more appropriately