Fixed some bad names