change option names: xxxId to xxx