Updated more names, and changed explanations