generate unique function names, and squash funny characters (i.e. quotes)
partial roll-back of 'cdde576182a99335149d9144ba8732dd7cc419b9' which broke test runner
re-generate code with named function style