fix the name of `keyNameMap`
a little refactor
refactor `normalize`