Reflect the new keyholder terminology