added some naming things