fix namings
Merge pull request #471 from ffrensch/master

fix namings