Update names and structure in ZendService classes
Merge pull request #1006