Fix incorrect names, and clean up style.