Fix conflicting classes