Updated naming
Merge pull request #1 from emkopp/master

Updated naming