Refactor/naming conventions #50

Merged
bumi merged 3 commits from refactor/naming-conventions into master 2018-04-15 18:17:48 +00:00