linting and naming fixes