small optimization and option renaming