core: Rename modules to match with convention