Fix spelling (#3845)

* Fix spelling

* Add missing entry

* Proper fix for KeyPair
16 jobs for master in 36 minutes and 56 seconds (queued for 12 seconds)