Fixed name conflict in auto-generated code