making lawyer and assignee disambig consistent