Fixed some naming things.