A few more changed to the API
Renamed some generators.