Small name change tweaks

Esc/enter has same effect as de-focus.