Before class nomenclature changes.