Always generate types in a namespace.
Restore variables generation.