Adjust for latest naming conventions #56

Merged
bumi merged 2 commits from naming-conventions into master 2018-04-17 11:29:09 +00:00