More consistent naming
Merge branch 'naming' of https://github.com/zetok/Antox into zetok-naming
Merge branch 'zetok-naming'