Merge pull request #49 from inspiran/refactor

Adjusted service names
Adjusted naming of collections