Update for some names and headlines in ZendService classes
Merge pull request #1028 in master
Merge pull request #1138
Merge pull request #1138 in develop