improved naming scheme
Merge pull request #6 from cptaffe/dev

improved naming scheme