Fix struct name conflict