Cleanup to reflect nomenclature change