rename modules to entities