Rename and fix indenting.