Update more names to follow our coding style.