Fix key name bugs.