Rename arguments to options