update names and attributions as suggested