Adjusted naming of collections
Merge pull request #50 from inspiran/refactor

Adjusted naming of collections