Fix class name conflict