Cleaning up some naming things