Correct typedefs within generators