Fixed some of the names