Summary: This is the renaming part of 6961697 to keep the actual changes small for review.
Reviewed-by: kvn, never