Keep two names intact that were broken on master for the sake
of simplicity: legacy map stays in place for these two.

(cherry picked from commit 4763373d)
(cherry picked from commit 9ad060f6)
(cherry picked from commit a90efa28)
(cherry picked from commit d83563fa)
(cherry picked from commit 4b99ff9f)
(cherry picked from commit 9205427c)
(cherry picked from commit 40879017)
(cherry picked from commit ffbbfc96)
(cherry picked from commit a674b5e0)