Rename fragments to align with our current user flow; code review skip as changes are only renames.
(cherry picked from commit 0841968)