rewrite generator names