Changed some naming things