Resolve some issues with similar sounding words