Clean up some naming