Better option names for PBE (#1891)