Rename service to system