fixed class name conflict