Fix linting errors with dupe variable name