Finalised naming convention, linter no longer complains - #4