Rename option vars according to step rename