Correct typedefs within generators
Redesign generators