Change nomenclature to match FeinCMS's.