Fix classname conflict