Fixed option text.
More renaming.