backporting option name correction done in 3.0