Clean up some naming messes