Changed self-references to named class references.