[TASK] Consistent naming
Merge pull request #187 from bjo3rnf/naming

[TASK] Consistent naming