Update names and structure in ZendService classes