Rename zone to passwordModifier (refs #3505)