Renamed and refactor (intent services names and comments)