option names fix