be consistent on a few ambiguous spellings