Issue #3391786 by quietone, xjm, smustgrave: Fix spelling of words only misspelled in tests, variable names, part 5 (cherry picked from commit 6dc9ce0b)