Fixed option attribute names