fixed options
moved servicename generation into generator