Consistent varnames for #43 + guidelines.
Merge branch 'feature/43-consistent-var-names' into develop