Rename and minor rewording.