Fixed linting error and fixed naming clash