[builtin/getopts refactor] Minor renaming