Rename clientnum, etc to client ID