Update names and structure in ZendService classes
Merge pull request #1012 in master
Merge pull request #1010 in master
Merge pull request #1006
Merge pull request #1006 in develop