This is a separate commit because the tests are supposed to pass with both the old spelling and the new.