[options] more renames