Making more names in generated code fully-qualified