Fix class name collision