Added variant-null-name option