Switch to Defines for Web service names, re gen of other files