Simple rename, and +/- a comment