Rename modules to be more meaningfull