Fixing incorrect class references.