Use class canonical names