Rename a few modes and clean up list iteration