Cleanup variable names in pick.