make generator namespace aware
Merge pull request #1283 from akhilstanislavose/namespace-fix

Make generator namespace aware