Fix incorrect class refs