More work on generators.
Make the generator path and name prettier.