Fixed a few names