Better default names

and linting fixes