fixed option struct names