Merge pull request #23 from chives/dev

Namespaces cleanup
Services and parameters renamed