Fix wrong class references