much improved name proposals in linked mode
refactor