Fixing code generation namespace issues