Fixed generator names