Fix a few more names