changed service definitions
fixed typos in doctrine annotations