Updated names and structure in ZendService classes