Fix element name conflict