Re Gen, added URL defines to all gened constants files, fixed payment class to to json was coreect.
Switch to using defines for Web service Names