Fix generator names