Rename module and service