Let's spell right in my spellcheck PR

Updates #2900
Land #2901, gooder spelling
No need to fiddle with naming context
Merge remote-tracking branch 'upstream/master' into enum_ad_perf
Dont lookup twice