Changed option names to use full representations