[Issue #22] disambiguate: pick refers that were referred from same ns in old ns form