Changed naming conventions of generated services.