Rename option classes