Fix conflict with generator names