Naming, linting and minor changes