Changes in servicebuilder templates to generate correct services