hajj, hajji

A pilgrimage to Mecca is a hajj.

The pilgrim is a hajji, who may then use the title Hajji (capped before a proper name).