Some fixes on names-screen.