Improve Names and (Keyboard)-Input