Simplify generator naming