Revert "Adjust for new naming conventions" #48

Merged
bumi merged 1 commits from revert-45-refactor/naming-conventions into master 2018-04-15 16:42:36 +00:00