rename & add keymap