adapt generators to new header style